Merged remote-tracking branch 'upstream/master'

This commit is contained in:
furrtek 2015-11-18 22:01:48 +01:00
commit 835d581e6c
135 changed files with 8512 additions and 7734 deletions

View file

@ -34,27 +34,6 @@ namespace ui {
char hexify(char in);
class BasebandStatsView : public View {
public:
BasebandStatsView();
void on_show() override;
void on_hide() override;
private:
Text text_used {
{ 0, 0, 7 * 8, 1 * 16 },
"",
};
Text text_idle {
{ 8 * 8, 0, 7 * 8, 1 * 16 },
"",
};
void on_statistics_update(const BasebandStatistics& statistics);
};
class DebugMemoryView : public View {
public:
DebugMemoryView(NavigationView& nav);