Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9e6dc9fbce
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-09-12 22:32:07 +02:00
41 changed files with 802 additions and 734 deletions

View File

@@ -82,6 +82,14 @@ class CTouchFileNotifier : public CChangeObserver
bool changeNotify(const neutrino_locale_t, void * data);
};
class CFlagFileNotifier : public CChangeObserver
{
const char * filename;
public:
inline CFlagFileNotifier(const char * _filename) { filename = _filename; };
bool changeNotify(const neutrino_locale_t, void * data);
};
class CColorSetupNotifier : public CChangeObserver
{
public: