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

Origin commit data
------------------
Branch: ni/coolstream
Commit: e9bc524562
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-27 (Mon, 27 Jan 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2014-01-27 21:00:18 +01:00
11 changed files with 51 additions and 9 deletions

View File

@@ -65,6 +65,7 @@
#include <driver/screen_max.h>
#include <driver/display.h>
#include <system/settings.h>
#include <algorithm>