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

Conflicts:
	configure.ac


Origin commit data
------------------
Branch: ni/coolstream
Commit: ff2ee78317
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-05-16 15:28:08 +02:00
23 changed files with 185 additions and 87 deletions

View File

@@ -55,7 +55,7 @@ void CBuildInfo::initVarBuildInfo()
setWindowHeaderButtons(CComponentsHeader::CC_BTN_MENU | CComponentsHeader::CC_BTN_EXIT);
shadow = true;
shadow = CC_SHADOW_ON;
}