Merge remote-tracking branch 'tuxbox/master'

This commit is contained in:
Stefan Seyfried
2017-02-15 20:26:44 +01:00
12 changed files with 239 additions and 28 deletions

View File

@@ -60,6 +60,7 @@
#include <gui/buildinfo.h>
#include <gui/widget/buttons.h>
#include <system/helpers.h>
#include <gui/components/cc_timer.h>
#if HAVE_COOL_HARDWARE
extern int cs_test_card(int unit, char * str);