mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity
15,054 Commits 2 Branches 9 Tags
09aeae56c9e8164e57dcadc688dba6b68f25d60b
Commit Graph

289 Commits

Author SHA1 Message Date
Stefan Seyfried
eedb5b86ce configure: only require libbluray on coolstream 
Origin commit data
------------------
Commit: 6a35e27642
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)
 2014-04-27 19:25:22 +02:00
Stefan Seyfried
3f36062fe7 Merge remote-tracking branch 'check/next-cc' 
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)
 2014-04-27 19:14:06 +02:00
Thilo Graf
afb44fe375 configure: add libbluray support into configure 
It may happen that the build process aborts if this lib is not
expilzit specified, although this lib is not used directly
by neutrino.
It seems to be dependent of build environment, and should be understand
as a prevention.


Origin commit data
------------------
Commit: f2bfa22159
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-02-23 (Sun, 23 Feb 2014)
 2014-03-03 08:54:09 +01:00
Stefan Seyfried
be735f6a31 lua: detect if static or dynamic linking is wanted 
Origin commit data
------------------
Commit: 899837e003
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-26 (Sun, 26 Jan 2014)
 2014-01-26 01:25:06 +01:00
gixxpunk
84577152ea rewrite Lua handling 
* depend pkg checks on enable-lua switch
* define STATIC_LUAPOSIX in case of static lua build to exclude unwanted
code in neutrino
* remove DYNAMIC_LUAPOSIX code as it's not needed in case of dynamic lua
build


Origin commit data
------------------
Commit: 4b6d2d310c
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2014-01-25 (Sat, 25 Jan 2014)

Origin message was:
------------------
- rewrite Lua handling

* depend pkg checks on enable-lua switch
* define STATIC_LUAPOSIX in case of static lua build to exclude unwanted
code in neutrino
* remove DYNAMIC_LUAPOSIX code as it's not needed in case of dynamic lua
build
 2014-01-25 21:17:06 +01:00
Stefan Seyfried
e05d1def44 Revert "Add a --enable-lua switch to enable LUA support" 
This reverts commit 2056b4ed80.

This just makes the code unreadable and why would one build
without lua :-)


Origin commit data
------------------
Commit: 5525e9f4b5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-23 (Thu, 23 Jan 2014)
 2014-01-23 14:11:03 +01:00
Stefan Seyfried
a112e8fb49 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
------------------
Commit: b414474323
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-23 (Thu, 23 Jan 2014)
 2014-01-23 14:08:37 +01:00
Michael Liebmann
2056b4ed80 Add a --enable-lua switch to enable LUA support 
Origin commit data
------------------
Commit: 82d4832013
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-21 (Tue, 21 Jan 2014)
 2014-01-21 17:05:24 +01:00
Stefan Seyfried
ad9a584052 configure: try to autodetect lualib 
Origin commit data
------------------
Commit: 966c7f1379
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-27 (Mon, 27 May 2013)
 2014-01-19 20:57:37 +01:00
Stefan Seyfried
8d876ff4ef Merge remote-tracking branch 'check/next-cc' 
untested, probably needs some buildfixing


Origin commit data
------------------
Commit: 7d87ce9c54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)
 2013-12-22 21:25:05 +01:00
[CST] Focus
e86e6a4b23 configure.ac: add --enable-ffmpegdec option to switch between old decoders and ffmpeg decoder 
Origin commit data
------------------
Commit: 64e2a0c2ad
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-12-15 (Sun, 15 Dec 2013)
 2013-12-15 14:46:45 +04:00
martii
a8f5b925e9 driver/audiodec: Switch to ffmpeg, drop custom decoder implementations, drop libvorbis/libmad/libid3/libogg/libflac. Not fully regression tested. 
Conflicts:
	configure.ac
	src/Makefile.am
	src/driver/audiodec/Makefile.am


Origin commit data
------------------
Commit: d5ea074457
Author: martii <m4rtii@gmx.de>
Date: 2013-10-19 (Sat, 19 Oct 2013)
 2013-12-15 14:40:53 +04:00
Stefan Seyfried
53d485c333 configure: put buildinfo stuff in own config header 
...so there's no need to rebuild everything all the time


Origin commit data
------------------
Commit: 06f233b288
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)
 2013-11-13 14:34:18 +01:00
Stefan Seyfried
261ea85af6 Merge branch 'check/next-cc' 
Only compile-tested.


Origin commit data
------------------
Commit: 548448456a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)
 2013-11-13 14:04:15 +01:00
Stefan Seyfried
abe49faabb fix cleantargets 
Origin commit data
------------------
Commit: f04bfbdd88
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)
 2013-11-13 10:38:42 +01:00
Stefan Seyfried
4d7f78c8a0 Makefiles: simplify includes for libcoolstream/libstb-hal 
Origin commit data
------------------
Commit: 3a728f9ee1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-11 (Mon, 11 Nov 2013)
 2013-11-11 21:51:08 +01:00
Michael Liebmann
92dd88d98d Add display of build info 
- Display compiler version, compiler flags, build PC, kernel version
- configure.ac part ported from filezilla project


Origin commit data
------------------
Commit: 4cf4857201
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-10-17 (Thu, 17 Oct 2013)
 2013-11-11 00:20:09 +01:00
Stefan Seyfried
107ca7babc fix cleantargets 
Origin commit data
------------------
Commit: 7fbbcbe9a4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)
 2013-11-10 19:47:44 +01:00
Stefan Seyfried
80b809a370 Merge branch 'check/next-cc' 
Compiles on most platforms, starts. Not really tested.


Origin commit data
------------------
Commit: b93a372b54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)
 2013-11-10 16:55:53 +01:00
Thilo Graf
adf19708da CTestMenu: add configure option --enable-testmenu 
Origin commit data
------------------
Commit: 6f700d80c0
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-11-04 (Mon, 04 Nov 2013)
 2013-11-05 13:22:28 +01:00
Stefan Seyfried
446ce560d1 fix build when --with-stb-hal-build is given 
Origin commit data
------------------
Commit: 756080ba19
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-03 (Sun, 03 Nov 2013)
 2013-11-03 12:20:58 +01:00
Stefan Seyfried
93071bc9d2 allow empty --with-stb-hal-build path 
Origin commit data
------------------
Commit: 6f174c2c26
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-03 (Sun, 03 Nov 2013)
 2013-11-03 02:09:32 +01:00
[CST] Focus
897e889f43 add libiw to build 
Origin commit data
------------------
Commit: 7f01a5740d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-01 (Fri, 01 Nov 2013)
 2013-11-01 16:43:06 +04:00
Stefan Seyfried
e6cbfe61bc Merge branch 'check/next-cc' 
Compiles on most platforms, starts. Not really tested.

Conflicts:
	acinclude.m4
	lib/libdvbsub/Makefile.am
	lib/libtriple/Makefile.am
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/create_rcsim_h.sh
	src/daemonc/Makefile.am
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/streaminfo2.h
	src/gui/update.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/rcsim.c
	src/system/Makefile.am
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)
 2013-10-21 22:58:55 +02:00
Michael Liebmann
9e3b8e79bf src/system/mtdutils: Add and patch makefiles 
Origin commit data
------------------
Commit: 2299807e11
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-01 (Sun, 01 Sep 2013)
 2013-09-27 06:44:34 +02:00
Stefan Seyfried
6830b68cac Merge branch 'check/next-cc' 
again: it compiles, but is not really tested...

Conflicts:
	acinclude.m4
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/osd_setup.cpp
	src/gui/start_wizard.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Commit: 7cfe54dc2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-07-06 (Sat, 06 Jul 2013)
 2013-07-06 19:01:15 +02:00
[CST] Focus
d09745a48f add initial Astra 19e settings to install 
Origin commit data
------------------
Commit: 33bc58915a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-28 (Fri, 28 Jun 2013)
 2013-06-28 16:12:33 +04:00
Stefan Seyfried
fce4dbbe72 Merge branch 'check/next-cc' 
it compiles, but is not really tested...

Conflicts:
	src/driver/netfile.cpp
	src/driver/volume.cpp
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/bouquetlist.cpp
	src/gui/eventlist.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/scan.cpp
	src/gui/test_menu.h
	src/gui/timerlist.cpp
	src/gui/update.cpp
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Commit: d5d5a60261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)
 2013-06-16 21:22:14 +02:00
Michael Liebmann
ed0c31f657 Software update: Add flash.start to neutrino start/stop scripts 
Origin commit data
------------------
Commit: d74ce0da45
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-08 (Sat, 08 Jun 2013)

Origin message was:
------------------
* Software update: Add flash.start to neutrino start/stop scripts
 2013-06-08 16:20:32 +02:00
Stefan Seyfried
67acbf5408 configure: remove linker hacks, now that libstb-hal is fixed 
Origin commit data
------------------
Commit: 862fb0aada
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-01 (Sat, 01 Jun 2013)
 2013-06-01 13:56:41 +02:00
Stefan Seyfried
91f1409e6a configure: try to autodetect lualib 
Origin commit data
------------------
Commit: 0c3c93e7db
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-27 (Mon, 27 May 2013)
 2013-05-27 13:36:50 +02:00
Stefan Seyfried
f6c0718366 Merge remote-tracking branch 'check/next-cc' 
needs some build-fixing and merge errors are likely :-(

Conflicts:
	configure.ac
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/unmaintained/dutch.locale
	lib/libdvbsub/Makefile.am
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/daemonc/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/framebuffer.h
	src/driver/pictureviewer/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/driver/volume.cpp
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/audioplayer.cpp
	src/gui/bedit/Makefile.am
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/keybind_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/test_menu.cpp
	src/gui/test_menu.h
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am
	src/system/setting_helpers.cpp
	src/system/settings.h
	src/zapit/include/zapit/client/zapitclient.h
	src/zapit/include/zapit/femanager.h
	src/zapit/include/zapit/getservices.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)
 2013-05-10 10:06:47 +02:00
Stefan Seyfried
bc3710042a neutrino: remove glthread, use GLFramebuffer instead 
now that libstb-hal provides an easy to use virtual framebuffer,
use it instead of the glthread implementation.


Origin commit data
------------------
Commit: e388b08dfe
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-04 (Sat, 04 May 2013)
 2013-05-04 13:07:52 +02:00
Stefan Seyfried
7837ef59d7 acinclude: better fix for pkg-config 0.28 behaviour 
Old pkg-config always retured a non-empty string for --cflags.
It always contained at least one bogus space. New pkg-config
does not do that. Do not rely on --cflags being non-empty.


Origin commit data
------------------
Commit: 79184569fc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-27 (Sat, 27 Apr 2013)
 2013-04-27 22:02:02 +02:00
[CST] Focus
1bd0bd8a7b Merge branch 'pu/cc' into next-cc 
Conflicts:
	acinclude.m4
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/volume.cpp
	src/eitd/SIlanguage.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan.h
	src/gui/test_menu.cpp
	src/gui/timeosd.cpp
	src/gui/widget/progressbar.cpp
	src/gui/widget/progressbar.h
	src/neutrino.cpp
	src/nhttpd/yconfig.h


Origin commit data
------------------
Commit: 8bb70d1ab3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-17 (Wed, 17 Apr 2013)
 2013-04-17 13:32:12 +04:00
Stefan Seyfried
f1e664b75e Merge branch 'check/pu-cc' into master 
needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/framebuffer.h
	src/driver/volume.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/filebrowser.cpp
	src/gui/imageinfo.cpp
	src/gui/infoviewer.cpp
	src/gui/streaminfo2.cpp
	src/gui/widget/textbox.cpp


Origin commit data
------------------
Commit: 5ad0b6b6dc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
 2013-04-06 11:21:55 +02:00
Thilo Graf
c7cf5b94ec Data files: add license files 
Avoids hard coded parts e.g. for use mainly in image info.


Origin commit data
------------------
Commit: 98b3265719
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-03-18 (Mon, 18 Mar 2013)
 2013-03-18 12:05:01 +01:00
Stefan Seyfried
2158fee441 remove obsolete embedded libtriple 
the code is unmaintained and probably non-functional, everyone
should use libstb-hal instead


Origin commit data
------------------
Commit: d2d8218885
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-06 (Wed, 06 Mar 2013)
 2013-03-06 17:23:46 +01:00
[CST] Focus
4315e86a75 configure.ac: add enable-pip option 
Origin commit data
------------------
Commit: 57cdcd8379
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-05 (Tue, 05 Mar 2013)
 2013-03-05 18:33:52 +04:00
[CST] Focus
e15f1c4c72 Merge branch 'dvbsi++' into next 
Conflicts:
	src/neutrino.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Commit: 026592e8fe
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-28 (Thu, 28 Feb 2013)
 2013-02-28 16:39:34 +04:00
Stefan Seyfried
1684f2481d make the extupdate build conditional 
extupdate is not very useful for most platforms, so only
build it if --enable-extupdate is passed to configure


Origin commit data
------------------
Commit: 5b72a7fe3c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-22 (Fri, 22 Feb 2013)
 2013-02-22 17:14:38 +01:00
Thilo Graf
e244a9c9c2 CComponents: move class into its own source directory 
The components could over time become quite large,
so it makes more sense, coming features to split into
multiple files and to do it in a separate directory.


Origin commit data
------------------
Commit: 0a961a4cf6
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-02-19 (Tue, 19 Feb 2013)
 2013-02-19 11:27:46 +01:00
Thilo Graf
a505299418 CComponents: move class into its own source directory 
The components could over time become quite large,
so it makes more sense, coming features to split into
multiple files and to do it in a separate directory.


Origin commit data
------------------
Commit: f3f347bdb3
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-02-12 (Tue, 12 Feb 2013)
 2013-02-16 12:13:24 +01:00
[CST] Focus
5e93ba0b6b configure.ac: always define HAVE_COOLSTREAM_NEVIS_IR_H, ifdef in rcinput.h decide what to include 
Origin commit data
------------------
Commit: 6724414335
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
 2013-01-30 11:16:24 +04:00
[CST] Bas
a310363ee8 neutrino: add multiple paths so they can be configured and not be hard-coded in 
multiple files.


Origin commit data
------------------
Commit: ee169288a5
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2013-01-28 (Mon, 28 Jan 2013)

Origin message was:
------------------
neutrino: add multiple paths so they can be configured and not be hard-coded in
     multiple files.
 2013-01-29 01:18:38 +08:00
[CST] Focus
cc1318fd0b configure.ac: change tests for apollo headers 
Origin commit data
------------------
Commit: 18380c2e94
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)
 2013-01-11 14:00:25 +04:00
Stefan Seyfried
b712b2f284 fix nevis_ir.h check and libcoolstream/hwcaps 
Origin commit data
------------------
Commit: acfd623d02
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-30 (Sun, 30 Dec 2012)
 2012-12-30 21:36:44 +01:00
Stefan Seyfried
6e17b3f254 Merge branch 'uncool/dvbsi++' commit 610ce926f5 
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp


Origin commit data
------------------
Commit: f8f5467fdb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-30 (Sun, 30 Dec 2012)
 2012-12-30 21:35:20 +01:00
Michael Liebmann
7332aea363 Fix include path for moved header files 
Origin commit data
------------------
Commit: b1138e16b0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-12-13 (Thu, 13 Dec 2012)

Origin message was:
------------------
* Fix include path for moved header files
 2012-12-13 18:09:09 +01:00
[CST] Bas
0210f795d2 neutrino: use pkgconfig for OGG. 
Origin commit data
------------------
Commit: cdcd42ea8a
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-12-03 (Mon, 03 Dec 2012)
 2012-12-04 00:24:46 +08:00