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

Conflicts:
	src/gui/scan_setup.cpp
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Commit: 55743aff0c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
This commit is contained in:
vanhofen
2017-03-15 23:39:43 +01:00
42 changed files with 241 additions and 144 deletions

View File

@@ -75,7 +75,6 @@ typedef struct gradientData_t
#define WINDOW_SIZE_MAX 100 // %
#define WINDOW_SIZE_MIN 50 // %
#define WINDOW_SIZE_MIN_FORCED 80 // %
#define ConnectLineBox_Width 16 // px
/** Ausfuehrung als Singleton */
class CFrameBuffer : public sigc::trackable