Merge fixing, commit to catch up on recent files

This commit is contained in:
furrtek
2016-02-04 10:27:53 +01:00
parent 44638e504b
commit 6e496e2b26
90 changed files with 2257 additions and 1428 deletions

View File

@@ -86,7 +86,7 @@ private:
*/
class RDSView : public View {
public:
RDSView(NavigationView& nav, TransmitterModel& transmitter_model);
RDSView(NavigationView& nav);
~RDSView();
void focus() override;
@@ -94,7 +94,6 @@ public:
private:
char psname[9];
TransmitterModel& transmitter_model;
Text text_title {
{ 76, 16, 88, 16 },