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

..

.svnignore

…

audio_cs.h

libcs headers update

2012-03-28 16:16:09 +00:00

ca_cs.h

libcoolstream/ca_cs.h: sync header

2013-03-08 17:56:03 +04:00

cnxtfb.h

fix comma at end of enumerator list

2013-05-28 15:52:31 +02:00

control.h

lib/libcoolstream: sync headers

2013-01-11 11:10:58 +04:00

cs_api.h

lib/libcoolstream: sync headers

2013-01-11 11:10:58 +04:00

cs_frontpanel.h

fix comma at end of enumerator list

2013-05-28 15:52:31 +02:00

cs_types.h

lib/libcoolstream: sync headers

2013-01-11 11:10:58 +04:00

cs_vfd.h

fix comma at end of enumerator list

2013-05-28 15:52:31 +02:00

dmx_cs.h

libcs headers update

2012-03-28 16:16:09 +00:00

hardware_caps.cpp

hw_caps: fix compile on coolstream

2012-11-10 22:53:48 +01:00

hardware_caps.h

hw_caps: fix compile on coolstream

2012-11-10 22:53:48 +01:00

Makefile.am

update lcddisplay and libcoolstream to AM_CPPFLAGS

2013-11-03 02:07:51 +01:00

mmi.h

mmi.h, cam_menu.cpp fix spelling error

2014-01-22 12:27:07 +04:00

nevis_ir.h

svn_CROSSENVIRONMENT_coolstream: move files to new right place

2012-12-13 10:49:06 +01:00

playback_cs.h

playback_cs.h: add MAX_PLAYBACK_PIDS define

2013-12-26 15:23:52 +04:00

playback.h

add generic dispatcher headers for frontend etc

2010-12-25 17:43:28 +00:00

pwrmngr.h

fix compil warrnings

2010-12-31 14:58:54 +00:00

record_cs.h

lib/libcoolstream/record_cs.h: update header

2012-09-25 17:13:43 +04:00

tsrouter.h

lib/libcoolstream: sync headers

2013-01-11 11:10:58 +04:00

video_cs.h

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

2013-05-10 10:06:47 +02:00