Stefan Seyfried 1b04f81e17 Merge branch 'uncool/dvbsi++' commit 785d3f2046 ...

Conflicts:
	src/eitd/SIevents.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7e701bfefc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-29 (Tue, 29 Jan 2013)



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

2013-01-29 21:27:41 +01:00

..

configure_network.cpp

Merge branch 'uncool/dvbsi++'

2012-11-11 01:45:22 +01:00

configure_network.h

Testing changes to support wireless network adapters configuration.

2011-03-16 12:57:09 +00:00

debug.cpp

our current experimental Neutrino branch

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

debug.h

our current experimental Neutrino branch

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

flashtool.cpp

comment out never used

2012-08-04 10:03:19 +02:00

flashtool.h

comma at end of enumerator list

2010-09-14 17:21:25 +00:00

fsmounter.cpp

our current experimental Neutrino branch

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

fsmounter.h

our current experimental Neutrino branch

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

helpers.cpp

Merge branch 'uncool/dvbsi++' commit 785d3f2046

2013-01-29 21:27:41 +01:00

helpers.h

system/helpers.cpp: Adding value 'bsize' as a possible return value

2013-01-01 15:05:21 +01:00

httptool.cpp

get rid of NEW_CURL hack, this API is long obsolete

2012-10-06 17:29:09 +02:00

httptool.h

our current experimental Neutrino branch

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

lastchannel.cpp

comment out never used

2012-08-04 10:03:19 +02:00

lastchannel.h

fix gcc 4.7.x warnings

2012-07-09 10:38:05 +02:00

localize.cpp

system/localize.cpp: fix destructor

2012-05-03 17:27:45 +04:00

localize.h

osd fix, tab for screening

2010-10-13 14:47:27 +00:00

locals_intern.h

neutrino: -add unicabel menu option

2013-01-08 20:35:53 +01:00

locals.h

neutrino: -add unicabel menu option

2013-01-08 20:35:53 +01:00

Makefile.am

Merge branch 'uncool/dvbsi++' commit 'd493b1155c4'

2012-10-14 12:51:07 +02:00

ping-config.h

our current experimental Neutrino branch

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

ping-linux.h

our current experimental Neutrino branch

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

ping.c

comment some found not used variables

2012-05-08 16:18:16 +04:00

ping.h

our current experimental Neutrino branch

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

safe_system.c

add a 'safe_system' function which avoids leaking FDs

2012-04-17 19:33:50 +02:00

safe_system.h

add a 'safe_system' function which avoids leaking FDs

2012-04-17 19:33:50 +02:00

setting_helpers.cpp

Merge branch 'uncool/dvbsi++' commit c6136d612f

2012-12-30 21:35:20 +01:00

setting_helpers.h

system/setting_helpers.cpp: add static CFanControlNotifier::setSpeed,

2012-11-02 14:18:56 +04:00

settings.cpp

user_menu: personalize also yellow and green buttons

2012-11-05 21:26:19 +01:00

settings.h

Merge branch 'uncool/dvbsi++' commit c6136d612f

2012-12-30 21:35:20 +01:00