mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 23:42:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'uncool/dvbsi++' commit c6136d612f

Browse Source 
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: f8f5467fdb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-30 (Sun, 30 Dec 2012)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2012-12-30 21:35:20 +01:00
parent d7219efd37 d57e57367f
commit a07b5d6289
84 changed files with 898 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/system/setting_helpers.cpp
View File

@@ -47,10 +47,6 @@
#include <sys/wait.h>
#include <sys/ioctl.h>
#if HAVE_COOL_HARDWARE
#include <coolstream/control.h>
#endif
#include <config.h>
#include <global.h>