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
+1 -3
View File
@@ -34,7 +34,7 @@ namespace ui {
class AboutView : public View {
public:
AboutView(NavigationView& nav, TransmitterModel& transmitter_model);
AboutView(NavigationView& nav);
~AboutView();
void on_show() override;
@@ -54,8 +54,6 @@ private:
bool same;
} ymreg_t;
TransmitterModel& transmitter_model;
uint16_t headphone_vol = 5<<2;
ymreg_t ym_regs[14];