vanhofen
d68d51d2b2
infoviewer: cleanup from some unused code
...
Origin commit data
------------------
Commit: d039017aa7
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-11-30 (Thu, 30 Nov 2017)
Origin message was:
------------------
- infoviewer: cleanup from some unused code
2017-11-30 10:55:14 +01:00
vanhofen
d46e7e7166
infoviewer: rework radiotext element; ...
...
use OFFSET defines, larger font, fix header width
Origin commit data
------------------
Commit: 79fcd2154a
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-11-27 (Mon, 27 Nov 2017)
Origin message was:
------------------
- infoviewer: rework radiotext element; ...
use OFFSET defines, larger font, fix header width
2017-11-27 23:18:14 +01:00
vanhofen
68e2832f96
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Conflicts:
src/Makefile.am
src/neutrino.cpp
Origin commit data
------------------
Commit: 4a07c24174
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-28 (Tue, 28 Feb 2017)
2017-02-28 16:55:39 +01:00
vanhofen
f5d9d25957
Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Conflicts:
src/neutrino.h
Origin commit data
------------------
Commit: 7829247fe8
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-28 (Tue, 28 Feb 2017)
2017-02-28 15:36:23 +01:00
Michael Liebmann
f74929b4ba
CInfoViewer::showTitle: Add parameter forcePaintButtonBar
...
Origin commit data
------------------
Commit: cc05d272f2
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2017-02-28 (Tue, 28 Feb 2017)
2017-02-28 15:04:09 +01:00
vanhofen
c4de218cb2
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Conflicts:
configure.ac
src/driver/Makefile.am
src/driver/framebuffer.h
src/gui/bookmarkmanager.cpp
src/gui/filebrowser.cpp
src/gui/widget/buttons.cpp
src/system/httptool.cpp
Origin commit data
------------------
Commit: dd6244f33e
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 13:19:03 +01:00
vanhofen
0707fef642
Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Conflicts:
src/gui/epgview.h
Origin commit data
------------------
Commit: e61a23cb74
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-08 (Wed, 08 Feb 2017)
2017-02-08 08:02:39 +01:00
Stefan Seyfried
f6d5a96838
replace fontrenderer.h include with forward declaration
...
in order to flatten the build dependency tree further, include
fontrenderer.h directly where needed, in header files a forward
declaration is enough
Origin commit data
------------------
Commit: 2303d94300
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-07 17:23:42 +01:00
vanhofen
bc33663742
Merge branch 'ni/mp' into ni/cst-next
...
Conflicts:
data/icons/shutdown.jpg
data/icons/start.jpg
data/locale/Makefile.am
data/locale/deutsch.locale
data/locale/english.locale
lib/libdvbsub/dvbsub.cpp
lib/libdvbsub/dvbsubtitle.cpp
lib/libtuxtxt/tuxtxt.cpp
lib/libtuxtxt/tuxtxt.h
src/gui/dboxinfo.cpp
src/gui/movieplayer.cpp
src/gui/streaminfo2.cpp
src/gui/themes.cpp
src/neutrino.cpp
src/neutrino_menue.cpp
src/nhttpd/Makefile.am
src/system/flashtool.cpp
Origin commit data
------------------
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-08-26 (Fri, 26 Aug 2016)
2016-08-26 19:13:47 +02:00
Michael Liebmann
8f904a91ec
analogclock: Save background for using transparent clock images
...
Origin commit data
------------------
Commit: 5d04ea65f4
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2016-08-22 (Mon, 22 Aug 2016)
2016-08-22 16:37:04 +02:00
Michael Liebmann
4246a31ba6
Merge branch 'cst-next' into nmp-cst-next
...
- Fix merge conflicts
Origin commit data
------------------
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2016-08-19 (Fri, 19 Aug 2016)
2016-08-19 17:40:48 +02:00
vanhofen
4cf2b60722
NI \o/
...
Origin commit data
------------------
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-05-19 (Thu, 19 May 2016)
2016-05-19 22:59:54 +02:00
Michael Liebmann
163dab2f58
Display of livestream infos in IV if no EPG data available
...
Origin commit data
------------------
Commit: eb1826ebee
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2016-03-03 (Thu, 03 Mar 2016)
2016-03-03 09:46:42 +01:00
vanhofen
3429ecfa2f
infoviewer: show movieplayers infoviewer in vzap mode if needed
...
Origin commit data
------------------
Commit: 944dab5a8c
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-02-04 (Thu, 04 Feb 2016)
Origin message was:
------------------
- infoviewer: show movieplayers infoviewer in vzap mode if needed
2016-02-04 00:14:57 +01:00
Michael Liebmann
304fea8be0
Merge branch 'cst-next' into nmp-cst-next
...
Origin commit data
------------------
Commit: b6d2bad857
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2016-01-21 (Thu, 21 Jan 2016)
2016-01-21 17:57:38 +01:00
Thilo Graf
c3e253361f
CInfoViewer: use different modes with enums for virtual zap and number input mode
...
This should fix missing rounded corners in numbaur input mode too.
Thx defans for input !
Origin commit data
------------------
Commit: 98b73c0d09
Author: Thilo Graf <dbt@novatux.de >
Date: 2016-01-12 (Tue, 12 Jan 2016)
2016-01-21 11:00:24 +01:00
Michael Liebmann
3c98408295
Merge branch 'cst-next' into nmp-cst-next
...
Origin commit data
------------------
Commit: f89463dc08
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2016-01-16 (Sat, 16 Jan 2016)
2016-01-16 07:22:31 +01:00
vanhofen
c1b0fe303f
infoviewer: some more little numbox-alignments
...
Origin commit data
------------------
Commit: 19d33dfb98
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-01-10 (Sun, 10 Jan 2016)
Origin message was:
------------------
- infoviewer: some more little numbox-alignments
2016-01-10 21:57:59 +01:00
Stefan Seyfried
8822421c6b
Merge remote-tracking branch 'uncool/cst-next'
...
Origin commit data
------------------
Commit: b837d8697b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2015-12-28 (Mon, 28 Dec 2015)
2015-12-28 16:15:14 +01:00
Thilo Graf
c6905d2f03
Colors: init global color gradient implementation
...
Origin commit data
------------------
Commit: 523b273af8
Author: Thilo Graf <dbt@novatux.de >
Date: 2015-11-19 (Thu, 19 Nov 2015)
2015-12-27 14:42:27 +01:00
Stefan Seyfried
17880c4125
Merge remote-tracking branch 'uncool/cst-next'
...
This need buildfixes and some functional updates...
Origin commit data
------------------
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2015-12-13 (Sun, 13 Dec 2015)
2015-12-13 17:41:55 +01:00
vanhofen
2f6f81af25
CInfoViewerBB: fix infobar ratio webtv
...
Signed-off-by: M. Liebmann <tuxcode.bbg@gmail.com >
Origin commit data
------------------
Commit: 45968b339d
Author: vanhofen <vanhofen@gmx.de >
Date: 2015-10-19 (Mon, 19 Oct 2015)
2015-10-21 12:31:04 +02:00
[CST] Focus
184f6649e3
gui/infoviewer.cpp: remove some showTitle wrapper, use epg-id to get events
...
Origin commit data
------------------
Commit: 329aea09be
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2015-06-02 (Tue, 02 Jun 2015)
2015-09-24 12:25:39 +03:00
vanhofen
939ed343f7
infoviewer: add color-to-color gradient feature; THX to TangoCash ...
...
... for basic inspiration and dbt for some optimizations
Origin commit data
------------------
Commit: 62daf1dc4c
Author: vanhofen <vanhofen@gmx.de >
Date: 2015-05-04 (Mon, 04 May 2015)
Origin message was:
------------------
- infoviewer: add color-to-color gradient feature; THX to TangoCash ...
... for basic inspiration and dbt for some optimizations
2015-05-04 09:41:41 +02:00
Stefan Seyfried
ac6fbc4d09
infoviewer: simplify clock handling
...
Origin commit data
------------------
Commit: 08daae7852
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2015-03-27 (Fri, 27 Mar 2015)
2015-03-27 13:27:22 +01:00
Stefan Seyfried
b9133dc4e1
infoviewer: simplify clock handling
...
Origin commit data
------------------
Commit: b74cf816cb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2015-02-21 (Sat, 21 Feb 2015)
2015-02-21 13:02:40 +01:00
Stefan Seyfried
ecc7af16ce
infoviewer.h: replace includes with forward declaration
...
Origin commit data
------------------
Commit: 8fcaeda6a4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2015-02-11 (Wed, 11 Feb 2015)
2015-02-14 14:31:12 +01:00
Stefan Seyfried
6974d51cf2
infoviewer: use forward declaration instead of including infoviewer_bb
...
Origin commit data
------------------
Commit: 967f85eb5f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2015-02-10 (Tue, 10 Feb 2015)
2015-02-14 14:31:11 +01:00
Stefan Seyfried
029ed69acb
infoviewer.h: replace includes with forward declaration
...
Origin commit data
------------------
Commit: 51b15fbc1d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2015-02-11 (Wed, 11 Feb 2015)
2015-02-11 08:41:27 +01:00
Stefan Seyfried
cf2ae5b16a
infoviewer: use forward declaration instead of including infoviewer_bb
...
Origin commit data
------------------
Commit: ce5084ea52
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2015-02-10 (Tue, 10 Feb 2015)
2015-02-10 15:38:21 +01:00
Stefan Seyfried
d1e2143fd6
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
------------------
Commit: d37b3c0f9a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-12-28 (Sun, 28 Dec 2014)
2014-12-28 12:32:12 +01:00
Stefan Seyfried
ec1a9fce17
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
------------------
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-12-25 (Thu, 25 Dec 2014)
2014-12-25 18:03:08 +01:00
Thilo Graf
3003c33c75
CInfoViewer: rework init and paint of clock
...
This removes some dimension assignments in start() because of
already existant and usable dimension values that comes directly
from clock object.
Origin commit data
------------------
Commit: a58bd6c235
Author: Thilo Graf <dbt@novatux.de >
Date: 2014-12-19 (Fri, 19 Dec 2014)
2014-12-19 10:19:51 +01:00
vanhofen
057998578e
infoviewer: fix calculation for time_width ...
...
... because some fonts has larger ' ' than ':'.
* align clock with 10 px right offset (same as the other elements)
* align depending elements with new clock dimensions
Origin commit data
------------------
Commit: 25f30a6fa4
Author: vanhofen <vanhofen@gmx.de >
Date: 2014-12-18 (Thu, 18 Dec 2014)
Origin message was:
------------------
- infoviewer: fix calculation for time_width ...
... because some fonts has larger ' ' than ':'.
* align clock with 10 px right offset (same as the other elements)
* align depending elements with new clock dimensions
2014-12-18 15:59:07 +01:00
[CST] Focus
3292ab7a9f
gui/movieplayer.cpp: add support for marked file list to play (file playback) and repeat modes,
...
original code (C) martii <m4rtii@gmx.de >
Origin commit data
------------------
Commit: d83d519c86
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2014-09-17 (Wed, 17 Sep 2014)
2014-09-17 20:13:49 +04:00
martii
79d013ce99
gui/infoviewer: remove no longer used class member "old_timestr"
...
Origin commit data
------------------
Commit: e4801974be
Author: martii <m4rtii@gmx.de >
Date: 2014-06-19 (Thu, 19 Jun 2014)
2014-06-20 14:35:22 +02:00
Stefan Seyfried
4c7a2f38df
Merge branch 'check/next-cc'
...
Only compile-tested.
Origin commit data
------------------
Commit: b5e736e81b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-11-30 (Sat, 30 Nov 2013)
2013-11-30 20:17:31 +01:00
Thilo Graf
32baf72e16
CInfoViewer: show time with CComponentsFrmClock object
...
This replaces old code that displayed time in infobar.
Origin commit data
------------------
Commit: ef374d7f8d
Author: Thilo Graf <dbt@novatux.de >
Date: 2013-11-26 (Tue, 26 Nov 2013)
2013-11-26 11:56:23 +01:00
vanhofen
2471b33db0
movieplayer: show channellogo in infobar
...
Origin commit data
------------------
Commit: 5ce5730f84
Author: vanhofen <vanhofen@gmx.de >
Date: 2013-11-15 (Fri, 15 Nov 2013)
Origin message was:
------------------
- movieplayer: show channellogo in infobar
2013-11-15 09:22:12 +01:00
Stefan Seyfried
2c76238007
Merge remote-tracking branch 'check/next-cc'
...
needs buildfixing...
Conflicts:
src/eitd/sectionsd.cpp
src/gui/audioplayer.cpp
src/gui/bedit/bouqueteditor_channels.cpp
src/gui/infoclock.cpp
src/gui/infoviewer.cpp
src/gui/motorcontrol.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/widget/progresswindow.cpp
src/gui/widget/textbox.cpp
src/neutrino.cpp
src/zapit/include/zapit/femanager.h
Origin commit data
------------------
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-09-01 (Sun, 01 Sep 2013)
2013-09-01 19:46:10 +02:00
[CST] Focus
df055e6ce1
gui/infoviewer.cpp: disable EVT_NOEPG_YET in virtual zap mode
...
Origin commit data
------------------
Commit: bbe63318b8
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-07-30 (Tue, 30 Jul 2013)
2013-07-30 11:13:50 +04: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
Michael Liebmann
5e2fac3491
Fix paint VolumeBar on InfoViewer
...
Origin commit data
------------------
Commit: 31e2dae622
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2013-06-26 (Wed, 26 Jun 2013)
2013-07-03 07:30:09 +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
Thilo Graf
6458c5cfb1
CInfoViewer: add member killInfobarText()
...
Ensure that no unnecessary instance of Components infobox is generated
and paint only changed text.
Origin commit data
------------------
Commit: 54d0f8b42b
Author: Thilo Graf <dbt@novatux.de >
Date: 2013-04-26 (Fri, 26 Apr 2013)
2013-04-27 22:20:10 +02:00
Thilo Graf
eb10fd6315
CInfoViewer: implement CComponentsInfoBox() to show infobar.txt content
...
Origin commit data
------------------
Commit: a09d7f4a7e
Author: Thilo Graf <dbt@novatux.de >
Date: 2013-04-24 (Wed, 24 Apr 2013)
2013-04-26 18:31:39 +02:00
Stefan Seyfried
f0f32ff08f
Merge branch 'check/pu-cc' into master
...
...needs some build- and logical fixing...
Conflicts:
data/locale/deutsch.locale
data/locale/english.locale
src/driver/volume.cpp
src/gui/eventlist.cpp
src/gui/moviebrowser.cpp
src/gui/scan.cpp
src/gui/timeosd.cpp
src/gui/widget/progressbar.cpp
src/gui/widget/progressbar.h
Origin commit data
------------------
Commit: 8b689f4b26
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 14:28:16 +02:00
Thilo Graf
03b22f2d23
CComponents: add progressbar class to cc-items
...
CProgressbar moved into components sub directory and adapt includes.
Progressbar objects are now usable as cc-item
TODO:
-some color and size corrections
-found some dub codes for sig and snr-bars, needs rework
Origin commit data
------------------
Commit: 860be9a412
Author: Thilo Graf <dbt@novatux.de >
Date: 2013-04-01 (Mon, 01 Apr 2013)
2013-04-02 09:31:05 +02:00
Stefan Seyfried
c6dee7045d
infoviewer: make oldinfo a member of the class
...
Origin commit data
------------------
Commit: 5033a9e4ef
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-03-25 (Mon, 25 Mar 2013)
2013-03-25 18:02:46 +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