Stefan Seyfried f8f5467fdb Merge branch 'uncool/dvbsi++' commit 4965619a79 ...

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

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

..

daemonc

neutrino: fix 32<->64bit format string warnings

2012-11-03 14:05:48 +01:00

driver

Merge branch 'uncool/dvbsi++' commit 4965619a79

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

eitd

Merge branch 'uncool/dvbsi++' commit 4965619a79

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

gui

Merge branch 'uncool/dvbsi++' commit 4965619a79

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

lcddisplay

neutrino: fix build on tripledragon

2012-11-10 13:48:10 +01:00

nhttpd

Merge branch 'uncool/dvbsi++' commit 4965619a79

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

system

Merge branch 'uncool/dvbsi++' commit 4965619a79

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

timerd

Merge branch 'uncool/dvbsi++' commit 4965619a79

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

zapit

Merge branch 'uncool/dvbsi++' commit 4965619a79

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

create_rcsim_h.sh

…

drivertool.c

* Fix include path for moved header files

2012-12-13 18:09:09 +01:00

global.h

Merge branch 'uncool/dvbsi++' commit '7ea3a20a808'

2012-11-03 10:45:33 +01:00

Makefile.am

more generic linking of libstb-hal

2012-12-01 13:54:29 +01:00

mymenu.h

…

neutrino_menue.cpp

mainmenu: use hw_caps instead of cs_get_revision

2012-11-14 22:21:51 +01:00

neutrino_menue.h

neutrino_menue.h: add menu ID for cable scan

2012-07-31 18:17:55 +04:00

neutrino.cpp

Merge branch 'uncool/dvbsi++' commit 4965619a79

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

neutrino.h

src/neutrino.cpp: -add lockStandbyCall

2012-11-08 12:24:23 +01:00

neutrinoMessages.h

…

plugin.h

…

rcsim.c

rcsim: remove unused label

2012-11-03 12:52:23 +01:00

rcsim.h

…