Stefan Seyfried
857402e3d4
Merge branch 'uncool/dvbsi++'
...
Conflicts:
src/driver/Makefile.am
src/driver/streamts.cpp
src/gui/audioplayer.cpp
src/gui/epgview.cpp
src/gui/infoviewer_bb.cpp
src/gui/widget/textbox.h
Origin commit data
------------------
Commit: c480e36746seife@tuxbox-git.slipkontur.de >
Date: 2012-11-11 (Sun, 11 Nov 2012)
2012-11-11 01:45:22 +01:00
[CST] Focus
52cfef2c77
gui/start_wizard.cpp: move initial settings question before calling scan setup
...
Origin commit data
------------------
Commit: 01383e083dfocus.cst@gmail.com >
Date: 2012-11-07 (Wed, 07 Nov 2012)
2012-11-07 20:50:18 +04:00
Stefan Seyfried
4ea8f88ad8
Merge branch 'uncool/dvbsi++' commit '626f1aabc0a'
...
...needs buildfixing...
Conflicts:
data/Makefile.am
src/driver/volume.cpp
src/gui/infoviewer.cpp
src/gui/miscsettings_menu.cpp
src/gui/movieplayer.cpp
src/gui/scan.cpp
src/gui/widget/buttons.cpp
src/gui/widget/menue.cpp
src/gui/widget/stringinput.cpp
src/neutrino.cpp
src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
src/system/setting_helpers.cpp
src/zapit/src/capmt.cpp
Origin commit data
------------------
Commit: 7e23ac7223seife@tuxbox-git.slipkontur.de >
Date: 2012-11-03 (Sat, 03 Nov 2012)
2012-11-03 10:45:33 +01:00
[CST] Focus
9d4a97ea84
gui/start_wizard.cpp: ask about initial settings on satellite box only
...
Origin commit data
------------------
Commit: 9d4c6165acfocus.cst@gmail.com >
Date: 2012-10-18 (Thu, 18 Oct 2012)
2012-10-18 13:53:13 +04:00
Stefan Seyfried
345a8a274d
Merge branch 'uncool/dvbsi++' commit '890b4f2c0a3'
...
...needs buildfixing...
Conflicts:
data/icons/shutdown.jpg
data/icons/start.jpg
lib/libtuxtxt/tuxtxt.h
src/driver/Makefile.am
src/driver/audiodec/Makefile.am
src/driver/framebuffer.cpp
src/driver/record.cpp
src/driver/volume.cpp
src/gui/audio_setup.cpp
src/gui/audioplayer.cpp
src/gui/epgview.cpp
src/gui/eventlist.cpp
src/gui/filebrowser.cpp
src/gui/infoviewer.cpp
src/gui/keybind_setup.cpp
src/gui/miscsettings_menu.cpp
src/gui/movieplayer.cpp
src/gui/osd_setup.cpp
src/gui/scan.cpp
src/gui/scan_setup.cpp
src/gui/streaminfo2.cpp
src/gui/update.cpp
src/gui/videosettings.cpp
src/gui/widget/menue.cpp
src/neutrino.cpp
src/neutrino_menue.cpp
src/system/Makefile.am
src/system/configure_network.cpp
src/system/httptool.cpp
src/system/setting_helpers.cpp
src/timerd/timermanager.cpp
src/zapit/include/zapit/frontend_c.h
src/zapit/src/Makefile.am
src/zapit/src/capmt.cpp
src/zapit/src/frontend.cpp
src/zapit/src/zapit.cpp
Origin commit data
------------------
Commit: adb23b23eeseife@tuxbox-git.slipkontur.de >
Date: 2012-10-14 (Sun, 14 Oct 2012)
2012-10-14 12:51:07 +02:00
[CST] Focus
f38e5d05a2
gui/start_wizard.cpp: copy initial zapit settings from /var/tuxbox/config/initial/ if found
...
Origin commit data
------------------
Commit: 4c41541f20focus.cst@gmail.com >
Date: 2012-09-29 (Sat, 29 Sep 2012)
2012-09-29 14:46:43 +04:00
Stefan Seyfried
89afc97ed9
remove branding
...
Origin commit data
------------------
Commit: 1a61b68644seife@tuxbox-git.slipkontur.de >
Date: 2012-02-19 (Sun, 19 Feb 2012)
2012-04-17 19:33:53 +02:00
Thilo Graf
fb63920b0f
neutrino clean up: move "start wizard" into its own module
...
It's better, to have a single module for coming features in the wizard
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2154 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: cfa58da3c6dbt@novatux.de >
Date: 2012-03-19 (Mon, 19 Mar 2012)
Origin message was:
------------------
* neutrino clean up: move "start wizard" into its own module
It's better, to have a single module for coming features in the wizard
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2154 e54a6e83-5905-42d5-8d5c-058d10e6a962
2012-03-19 09:00:11 +00:00
