Commit Graph

109 Commits

Author SHA1 Message Date
Stefan Seyfried
b0e9dfa0ff neutrino.h: use forward declaration instead of includes
this reduces the dependency chain on partial rebuilds considerably


Origin commit data
------------------
Branch: ni/coolstream
Commit: a7bad347d7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-11 (Wed, 11 Feb 2015)



------------------
This commit was generated by Migit
2015-02-11 08:22:36 +01:00
Stefan Seyfried
08f96ff53a disarm broken HAVE_SPARK_HARDWARE code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0bff1ff02d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-27 (Tue, 27 Jan 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-01-27 10:59:04 +01:00
Stefan Seyfried
2263c8bd2e Merge remote-tracking branch 'check/cst-next'
*needs buildfixing*

Conflicts:
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/driver/vfd.cpp
	src/gui/bedit/Makefile.am
	src/gui/components/Makefile.am
	src/gui/luainstance.cpp
	src/gui/widget/Makefile.am
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: b5a64e6887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)



------------------
This commit was generated by Migit
2015-01-26 17:26:26 +01:00
Jacek Jendrzej
5288c70665 neutrino use check empty() instead of length() or size()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8023a6317b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-01-03 (Sat, 03 Jan 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-01-03 17:51:08 +01:00
Stefan Seyfried
770e405c50 Merge remote-tracking branch 'check/cst-next'
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/luainstance.cpp
	src/gui/movieplayer.cpp
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/zapit.cpp


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



------------------
This commit was generated by Migit
2014-12-28 12:32:12 +01:00
Stefan Seyfried
c8e3ec41a9 Merge remote-tracking branch 'check/cst-next'
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)



------------------
This commit was generated by Migit
2014-12-25 18:03:08 +01:00
vanhofen
b976eb95c9 plugins: simplify integratePlugins(); ...
* CPluginsExec(): switch to singleton
* move CPluginsExec() to pluginlist.cpp|h
 because it's not really a settings_helper


Origin commit data
------------------
Branch: ni/coolstream
Commit: 389c4c232f
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-10 (Mon, 10 Nov 2014)

Origin message was:
------------------
- plugins: simplify integratePlugins(); ...

* CPluginsExec(): switch to singleton
* move CPluginsExec() to pluginlist.cpp|h
 because it's not really a settings_helper


------------------
This commit was generated by Migit
2014-11-10 22:41:08 +01:00
vanhofen
d27045664b user_menue: minor optimizations
Origin commit data
------------------
Branch: ni/coolstream
Commit: 348add4acd
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-07 (Fri, 07 Nov 2014)

Origin message was:
------------------
- user_menue: minor optimizations

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-11-07 15:39:53 +01:00
vanhofen
f7de4d583e user_menue: fix wrong changes in ec6cb635c0
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ec409b264
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-07 (Fri, 07 Nov 2014)

Origin message was:
------------------
- user_menue: fix wrong changes in ec6cb635c0

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-11-07 13:55:05 +01:00
vanhofen
ec6cb635c0 user_menue: allow colored keys from plugin.cfg
Origin commit data
------------------
Branch: ni/coolstream
Commit: 19f7e04c77
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-07 (Fri, 07 Nov 2014)

Origin message was:
------------------
- user_menue: allow colored keys from plugin.cfg

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-11-07 12:20:47 +01:00
vanhofen
8d64978b13 plugins: don't add hidden plugins to usermenu; ...
... use CPuginsExec::exec() to execute and drop CUserMenu::exec()


Origin commit data
------------------
Branch: ni/coolstream
Commit: c0b130c490
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-07 (Fri, 07 Nov 2014)

Origin message was:
------------------
- plugins: don't add hidden plugins to usermenu; ...

... use CPuginsExec::exec() to execute and drop CUserMenu::exec()


------------------
This commit was generated by Migit
2014-11-07 09:44:53 +01:00
vanhofen
539be4ea84 user_menue: fix hint icons for 'singe-added' plugins
Origin commit data
------------------
Branch: ni/coolstream
Commit: b93cb83c7c
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-06 (Thu, 06 Nov 2014)

Origin message was:
------------------
- user_menue: fix hint icons for 'singe-added' plugins

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-11-06 12:36:07 +01:00
[CST] Focus
11ad004322 gui/user_menue.cpp: add network settings and software update as user-menu items
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5d6ea715d8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-16 (Thu, 16 Oct 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-10-16 13:56:15 +04:00
vanhofen
facb9da7b8 - plugins: use hinticons for plugins in usermenu and pluginlist
Origin commit data
------------------
Branch: ni/coolstream
Commit: 088809b76f
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-10-06 (Mon, 06 Oct 2014)

Origin message was:
------------------
- - plugins: use hinticons for plugins in usermenu and pluginlist

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-10-07 13:19:19 +04:00
vanhofen
242ded4cc6 plugins: don't show integrated plugins in usermenu
Origin commit data
------------------
Branch: ni/coolstream
Commit: c166fc28af
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-30 (Tue, 30 Sep 2014)

Origin message was:
------------------
- plugins: don't show integrated plugins in usermenu

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-09-30 14:27:48 +04:00
vanhofen
167f8e295b setting_helpers: rename CStreamFeaturesChangeExec to CPluginsExec
Origin commit data
------------------
Branch: ni/coolstream
Commit: 237892ffd2
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-08 (Mon, 08 Sep 2014)

Origin message was:
------------------
- setting_helpers: rename CStreamFeaturesChangeExec to CPluginsExec

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-09-08 16:33:26 +02:00
[CST] Focus
626782207b gui/user_menue.cpp: fix old items code c/p
Origin commit data
------------------
Branch: ni/coolstream
Commit: e361f74af7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-08 (Mon, 08 Sep 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-09-08 14:35:56 +04:00
vanhofen
d641783b25 user_menu: re-rename ITEM_PLUGIN to ITEM_PLUGIN_TYPES
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8047531bc5
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-05 (Fri, 05 Sep 2014)

Origin message was:
------------------
- user_menu: re-rename ITEM_PLUGIN to ITEM_PLUGIN_TYPES

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-09-05 18:47:44 +02:00
[CST] Focus
4eb5179286 neutrino: sync keybind and usermenu code with neutrino-mp, code (C) martii
Origin commit data
------------------
Branch: ni/coolstream
Commit: 420af7a4dc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-09-05 17:49:11 +04:00
BPanther
6d40f01812 missing lua ifdef
Origin commit data
------------------
Branch: ni/coolstream
Commit: fe3379ddb7
Author: BPanther <bpanther_ts@hotmail.com>
Date: 2014-05-02 (Fri, 02 May 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-05-02 09:47:42 +02:00
Stefan Seyfried
8df9ff12cc 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
------------------
Branch: ni/coolstream
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)



------------------
This commit was generated by Migit
2014-04-27 19:14:06 +02:00
vanhofen
f1eee29e83 user_menue.cpp: whitespace cleanup
Origin commit data
------------------
Branch: ni/coolstream
Commit: a05121d9b7
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-03-06 (Thu, 06 Mar 2014)

Origin message was:
------------------
- user_menue.cpp: whitespace cleanup

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-03-06 12:56:24 +01:00
vanhofen
4d0f4ce3ac user_menu: add some pointers to delete
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c19f53e4b
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-03-06 (Thu, 06 Mar 2014)

Origin message was:
------------------
- user_menu: add some pointers to delete

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-03-06 12:45:48 +01:00
Stefan Seyfried
e942dbf393 revert the split into lots of plugin types
* present the user with only two types of extensions: games and
 everything else (lua, script, binary .so)
* use lua locale, right now it is translated to just "Plugins" :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 44e127a8dd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-16 (Sun, 16 Feb 2014)

Origin message was:
------------------
revert the split into lots of plugin types

* present the user with only two types of extensions: games and
 everything else (lua, script, binary .so)
* use lua locale, right now it is translated to just "Plugins" :-)


------------------
This commit was generated by Migit
2014-02-16 18:38:03 +01:00
Stefan Seyfried
59b887d87a Merge remote-tracking branch 'check/next-cc'
...only build-tested, needs fixes


Origin commit data
------------------
Branch: ni/coolstream
Commit: ecd62d81d1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-15 (Sat, 15 Feb 2014)



------------------
This commit was generated by Migit
2014-02-15 20:22:07 +01:00
vanhofen
076c7bb7ad plugins: type for listed plugins on blue key is more selectable
Origin commit data
------------------
Branch: ni/coolstream
Commit: e97ea955c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-02-06 (Thu, 06 Feb 2014)

Origin message was:
------------------
- plugins: type for listed plugins on blue key is more selectable

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-02-06 22:51:18 +01:00
vanhofen
b00e109f84 plugins: type for listed plugins on blue key is selectable
* add mainmenu items for tools and lua-extensions
 (default not visible)
* add usermenu items for tools and lua-extensions
 (default off)


Origin commit data
------------------
Branch: ni/coolstream
Commit: f9ad30f183
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-02-04 (Tue, 04 Feb 2014)

Origin message was:
------------------
- plugins: type for listed plugins on blue key is selectable

* add mainmenu items for tools and lua-extensions
 (default not visible)
* add usermenu items for tools and lua-extensions
 (default off)


------------------
This commit was generated by Migit
2014-02-04 09:08:21 +01:00
Stefan Seyfried
12041ff30b Revert "Add a --enable-lua switch to enable LUA support"
This reverts commit c980278eb1.

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5525e9f4b5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-23 (Thu, 23 Jan 2014)



------------------
This commit was generated by Migit
2014-01-23 14:11:03 +01:00
Stefan Seyfried
b7c804fc22 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
------------------
Branch: ni/coolstream
Commit: b414474323
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-23 (Thu, 23 Jan 2014)



------------------
This commit was generated by Migit
2014-01-23 14:08:37 +01:00
Michael Liebmann
c980278eb1 Add a --enable-lua switch to enable LUA support
Origin commit data
------------------
Branch: ni/coolstream
Commit: 82d4832013
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-21 (Tue, 21 Jan 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-01-21 17:05:24 +01:00
Michael Liebmann
7b4e3bc03b Preparing the menu classes for Lua Part #2
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
 THX Martii


Origin commit data
------------------
Branch: ni/coolstream
Commit: b41819190d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-16 (Thu, 16 Jan 2014)

Origin message was:
------------------
Preparing the menu classes for Lua Part #2

- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
 THX Martii


------------------
This commit was generated by Migit
2014-01-19 20:57:37 +01:00
Stefan Seyfried
88c69c92bd neutrino: add a prototype of a lua plugin interface
this is just for preliminary tests, not yet really usable
for anything useful


Origin commit data
------------------
Branch: ni/coolstream
Commit: f26357e887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-17 (Sun, 17 Mar 2013)



------------------
This commit was generated by Migit
2014-01-19 20:57:35 +01:00
Stefan Seyfried
402d13aa4d Merge remote-tracking branch 'check/next-cc'
Origin commit data
------------------
Branch: ni/coolstream
Commit: a92141d147
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-12 (Sun, 12 Jan 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-01-12 14:41:44 +01:00
Michael Liebmann
3ec81384cc Disable infoclock when user menu activ
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4c797ec3ec
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-12 (Sun, 12 Jan 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-01-12 10:48:06 +01:00
Stefan Seyfried
003773490b Merge remote-tracking branch 'check/next-cc'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 56a7262d5d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-05 (Sun, 05 Jan 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-01-05 18:31:31 +01:00
vanhofen
0803fba991 usermenu: cleanup from unused code
Origin commit data
------------------
Branch: ni/coolstream
Commit: e529bd011b
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-02 (Thu, 02 Jan 2014)

Origin message was:
------------------
- usermenu: cleanup from unused code

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-01-02 22:57:01 +01:00
vanhofen
8b72c56eba usermenu: add file player
Origin commit data
------------------
Branch: ni/coolstream
Commit: 419cff8c8a
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-02 (Thu, 02 Jan 2014)

Origin message was:
------------------
- usermenu: add file player

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-01-02 22:36:42 +01:00
vanhofen
d78388ea4d usermenu: add youtube player
Origin commit data
------------------
Branch: ni/coolstream
Commit: 47a2cf0e54
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-02 (Thu, 02 Jan 2014)

Origin message was:
------------------
- usermenu: add youtube player

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-01-02 21:52:33 +01:00
vanhofen
65cbab0307 Revert "global.h: Use forward-declarations to reduce number of dependencies"
This reverts commit c266f96560.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c8d47fa49
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)



------------------
This commit was generated by Migit
2013-11-13 23:40:16 +01:00
Stefan Seyfried
c266f96560 global.h: Use forward-declarations to reduce number of dependencies
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4bc6e43ad4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-11-13 10:40:03 +01:00
martii
f43b9f7e12 global.h: Use forward-declarations to reduce number of dependencies
[seife: amended to fix build]

Signed-off-by: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4eb66ba4b2
Author: martii <m4rtii@gmx.de>
Date: 2013-11-09 (Sat, 09 Nov 2013)



------------------
This commit was generated by Migit
2013-11-09 17:03:03 +01:00
Stefan Seyfried
7254e280e3 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
------------------
Branch: ni/coolstream
Commit: 5ad0b6b6dc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)



------------------
This commit was generated by Migit
2013-04-06 11:21:55 +02:00
Thilo Graf
6d6cf7e177 fix license text, sorry, was a c&p error
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0dc4686874
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-03-20 (Wed, 20 Mar 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-03-21 11:37:00 +01:00
Stefan Seyfried
1f3cbe691b neutrino: add a prototype of a lua plugin interface
this is just for preliminary tests, not yet really usable
for anything useful


Origin commit data
------------------
Branch: ni/coolstream
Commit: da358e7502
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-17 (Sun, 17 Mar 2013)



------------------
This commit was generated by Migit
2013-03-17 23:24:45 +01:00
Jacek Jendrzej
ed37bca2fd disable tech.info if channelist is empty (fix possible segfault)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 775a4a7229
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-20 (Sat, 20 Oct 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-10-20 13:26:27 +02:00
[CST] Focus
e44ee11353 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9fdbdbd343
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-09-13 (Thu, 13 Sep 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-09-13 11:24:13 +04:00
Jacek Jendrzej
67c5d7c91e remove doubles include
Origin commit data
------------------
Branch: ni/coolstream
Commit: a3bfab0bcd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-11 (Tue, 11 Sep 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-09-11 20:31:33 +02:00
[CST] Focus
1ebe453efb gui/user_menue.cpp: comment unused code
Origin commit data
------------------
Branch: ni/coolstream
Commit: ba051aaf41
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-30 (Thu, 30 Aug 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-08-30 11:31:05 +04:00
[CST] Focus
232bea4d5f gui/user_menue.cpp: add sectionsd pause to changeNotify
Origin commit data
------------------
Branch: ni/coolstream
Commit: 76200ddc94
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-05-31 (Thu, 31 May 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-05-31 15:59:13 +04:00
Thilo Graf
4716f67432 neutrino user-menu: remove color button from clock
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2119 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: bdb0c6f63c
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-02-23 (Thu, 23 Feb 2012)

Origin message was:
------------------
*neutrino user-menu: remove color button from clock

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2119 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
2012-02-23 10:45:22 +00:00