Merge remote-tracking branch 'check/next-cc'

Conflicts:
	src/neutrino.cpp
This commit is contained in:
Stefan Seyfried
2014-01-19 13:37:24 +01:00
15 changed files with 213 additions and 30 deletions

View File

@@ -90,7 +90,7 @@ class CVFD
unsigned int switch_name_time_cnt;
int fd;
int brightness;
char text[256];
std::string text;
void count_down();