mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'neutrino-apollo' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo

Browse Source 
Conflicts:
	src/timerd/timermanager.cpp
This commit is contained in:
[CST] Bas
2012-09-26 17:52:47 +08:00
parent fbc512889f 83636ebb6e
commit a222240dbb
15 changed files with 163 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/keybind_setup.cpp
View File

@@ -33,7 +33,7 @@
#include <config.h>
#endif
#ifdef HAVE_COOLSTREAM_NEVIS_IR_H
#ifdef HAVE_COOLSTREAM_CS_IR_GENERIC_H
/* define constants instead of #ifdef'ing the corresponding code.
* the compiler will optimize it away anyway, but the syntax is
* still checked */
@@ -41,7 +41,7 @@
#else
#define RC_HW_SELECT false
#ifdef HAVE_COOL_HARDWARE
#warning header coolstream/nevis_ir.h not found
#warning header coolstream/cs_ir_generic.h not found
#warning you probably have an old driver installation
#warning you´ll be missing the remotecontrol selection feature!
#endif