Stefan Seyfried b7c804fc22 Merge remote-tracking branch 'check/next-cc' ...

compiles, nothing else.

Conflicts:
	configure.ac
	src/Makefile.am
	src/gui/Makefile.am
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan_setup.cpp
	src/gui/start_wizard.cpp
	src/gui/test_menu.cpp
	src/gui/user_menue.cpp
	src/gui/widget/hintboxext.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/messagebox.cpp
	src/gui/widget/stringinput.cpp


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



------------------
This commit was generated by Migit

2014-01-23 14:08:37 +01:00

..

Makefile.am

Replacing obsolete 'INCLUDES' with 'AM_CPPFLAGS' in all Makefile.am

2013-10-17 04:22:49 +02:00

timerdclient.cpp

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

2014-01-23 14:08:37 +01:00

timerdclient.h

Preparing the menu classes for Lua Part #2

2014-01-19 20:57:37 +01:00

timerdmsg.h

our current experimental Neutrino branch

2009-12-08 11:05:11 +00:00

timerdtypes.h

timerd: rename TIMER_NEXTPROGRAM

2014-01-13 21:03:11 +01:00