Commit Graph

313 Commits

Author SHA1 Message Date
Stefan Seyfried
ed24f8fa69 osd_setup: remove g_settings.progressbar_design leftovers
needs more checking throughout the code base...


Origin commit data
------------------
Commit: 49f3516f47
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)
2014-12-25 18:32:21 +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
Michael Liebmann
a1c4c26202 CColorChooser: Preview color gradient for header color
Origin commit data
------------------
Commit: 8c3b26fc76
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-11-26 (Wed, 26 Nov 2014)
2014-11-26 09:42:44 +01:00
Michael Liebmann
772bc517be Switches color gradients on/off
Origin commit data
------------------
Commit: c7908c87f4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-09-20 (Sat, 20 Sep 2014)
2014-09-25 11:08:29 +04:00
martii
69f917f16d drop explicit CMenuForwarder icon assignments
Conflicts:
	src/gui/3dsetup.cpp
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/keybind_setup.cpp
	src/gui/mediaplayer.cpp
	src/gui/mediaplayer_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/network_setup.cpp
	src/gui/nfs.cpp
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/parentallock_setup.cpp
	src/gui/personalize.cpp
	src/gui/proxyserver_setup.cpp
	src/gui/record_setup.cpp
	src/gui/scan_setup.cpp
	src/gui/screensetup.cpp
	src/gui/settings_manager.cpp
	src/gui/timerlist.cpp
	src/gui/update_menue.cpp
	src/gui/vfd_setup.cpp
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: e84782bc4c
Author: martii <m4rtii@gmx.de>
Date: 2014-02-22 (Sat, 22 Feb 2014)
2014-09-15 11:44:08 +04:00
martii
547d900fee system/settings: move theme colors to dedicated struct
Conflicts:
	src/driver/pictureviewer/pictureviewer.cpp
	src/gui/epgview.cpp
	src/gui/osd_setup.cpp
	src/gui/pluginlist.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: b21cb152b5
Author: martii <m4rtii@gmx.de>
Date: 2014-01-06 (Mon, 06 Jan 2014)
2014-09-12 18:29:21 +04:00
martii
2c8f3910b2 add thread for determining free hdd (recording dir) space, enable hdd usage icons on vfd (untested)
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/simple_display.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/moviebrowser.cpp
	src/gui/record_setup.cpp
	src/neutrino.cpp
	src/system/ytcache.h


Origin commit data
------------------
Commit: 7c15db185f
Author: martii <m4rtii@gmx.de>
Date: 2013-11-27 (Wed, 27 Nov 2013)
2014-09-11 17:58:19 +04:00
martii
6593a7a8bd gui/channellist: make displaying channel numbers optional
Conflicts:
	data/locale/deutsch.locale
	src/gui/channellist.cpp
	src/gui/osd_setup.cpp


Origin commit data
------------------
Commit: 94e6cf9a25
Author: martii <m4rtii@gmx.de>
Date: 2014-07-19 (Sat, 19 Jul 2014)
2014-07-23 11:57:05 +04:00
[CST] Focus
467f73764a src/gui/osd_progressbar_setup.cpp: move infoviewer progressbar position config to osd_setup.cpp
Origin commit data
------------------
Commit: 4b3be3c313
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-18 (Fri, 18 Jul 2014)
2014-07-18 12:28:30 +04:00
[CST] Focus
e7589e894a gui/osd_setup.cpp: re-use common channel list settings in context menu
Origin commit data
------------------
Commit: c8b33f6bda
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-17 (Thu, 17 Jul 2014)
2014-07-17 17:02:47 +04:00
[CST] Focus
fa1be7a360 Revert "CChannelList/COsdSetup: use showOsdChanlistSetup() from OSD-Setup"
commit has problems: bad looking, if fade is ON, menu missed channel list fonts config

This reverts commit 5c9adb6180.


Origin commit data
------------------
Commit: 0cda142ba7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-17 (Thu, 17 Jul 2014)
2014-07-17 17:02:43 +04:00
[CST] Focus
17c40a5d6e merge neutrino-mp progressbar code, (C) martii
Origin commit data
------------------
Commit: 416646bbff
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-17 (Thu, 17 Jul 2014)
2014-07-17 17:02:37 +04:00
vanhofen
295885c56c osd_setup: don't show colored progress bar option in channellist ...
... when colored progress bar is disabled


Origin commit data
------------------
Commit: 8887767141
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-27 (Fri, 27 Jun 2014)

Origin message was:
------------------
- osd_setup: don't show colored progress bar option in channellist ...

... when colored progress bar is disabled
2014-06-27 18:26:13 +02:00
Thilo Graf
5c9adb6180 CChannelList/COsdSetup: use showOsdChanlistSetup() from OSD-Setup
This removes multiple code parts from COsdSetup without
loss of functionality.


Origin commit data
------------------
Commit: 253579909f
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-06-07 (Sat, 07 Jun 2014)
2014-06-23 18:43:47 +02:00
vanhofen
cb734e018f channellist: add colored progressbars
* thx to bazi98, martii and benny


Origin commit data
------------------
Commit: df1c8ac00d
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-23 (Mon, 23 Jun 2014)

Origin message was:
------------------
- channellist: add colored progressbars

* thx to bazi98, martii and benny
2014-06-23 17:05:44 +02:00
vanhofen
4f57f066d9 drop obsolete code around FONT_TYPE_GAMELIST
these fonts are not needed since gamelist/scriptlist
 are painted with menu-widget


Origin commit data
------------------
Commit: da7f3b9cb1
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-05-02 (Fri, 02 May 2014)

Origin message was:
------------------
- drop obsolete code around FONT_TYPE_GAMELIST

 these fonts are not needed since gamelist/scriptlist
 are painted with menu-widget
2014-05-02 22:28:36 +02:00
Stefan Seyfried
f853d06d3b Merge remote-tracking branch 'check/next-cc'
broken, needs buildfixing


Origin commit data
------------------
Commit: add688bbb8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-23 (Sun, 23 Feb 2014)
2014-02-23 15:17:48 +01:00
[CST] Focus
97bed9727f gui/osd_setup.cpp: add 'other' font sizes group,
add subtitles font size setup


Origin commit data
------------------
Commit: 29617ba843
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-16 (Sun, 16 Feb 2014)
2014-02-21 20:01:13 +04: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
01de5acc30 Preparing the input classes for Lua
- Add non locale variants for CExtendedInput, CStringInput,
 CStringInputSMS, CPINInput
 THX Martii


Origin commit data
------------------
Commit: 31842369cc
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-18 (Sat, 18 Jan 2014)

Origin message was:
------------------
Preparing the input classes for Lua

- Add non locale variants for CExtendedInput, CStringInput,
 CStringInputSMS, CPINInput
 THX Martii
2014-01-19 20:57:38 +01:00
Michael Liebmann
1918153c0a Preparing the menu classes for Lua Part #2
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
 THX Martii


Origin commit data
------------------
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
2014-01-19 20:57:37 +01:00
Stefan Seyfried
3aaf6770ea Merge remote-tracking branch 'check/next-cc'
Origin commit data
------------------
Commit: 7d379dcb30
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-29 (Sun, 29 Dec 2013)
2013-12-29 22:12:09 +01:00
vanhofen
afaa1a5180 channellist: channellogos can be disabled
Origin commit data
------------------
Commit: 9fb63a20d9
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-12-28 (Sat, 28 Dec 2013)

Origin message was:
------------------
- channellist: channellogos can be disabled
2013-12-28 23:39:51 +01:00
Stefan Seyfried
ccc691278c Merge remote-tracking branch 'check/next-cc'
Lightly tested only...


Origin commit data
------------------
Commit: cdd065fc2e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-25 (Wed, 25 Dec 2013)
2013-12-25 22:51:23 +01:00
Michael Liebmann
ab6a7d929a CInfoClock: menu item for setting color of the digit added
Origin commit data
------------------
Commit: 025295b6b4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-12-25 (Wed, 25 Dec 2013)
2013-12-25 18:32:01 +01:00
martii
ce44d1641a convert most char[...] configuration values to std::string
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: cbc9299df8
Author: martii <m4rtii@gmx.de>
Date: 2013-06-11 (Tue, 11 Jun 2013)
2013-12-25 12:08:14 +01:00
vanhofen
9059f739c9 osd-setup: use a more suitable value for maximal osd-timeout
Origin commit data
------------------
Commit: 798e926f3f
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)

Origin message was:
------------------
- osd-setup: use a more suitable value for maximal osd-timeout
2013-12-22 21:38:51 +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
martii
5e5d19c036 gui/osd_setup, gui/record_setup: use CMenuOptionNumberChooser ...
... instead of CStringInput to enter numbers

* neutrino.cpp: drop SetupTiming method
* system/settings: use integers for timing values#
* system/setting_helpers: drop CTimingSettingsNotifier


Origin commit data
------------------
Commit: 697b1a75b3
Author: martii <m4rtii@gmx.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)

Origin message was:
------------------
gui/osd_setup, gui/record_setup: use CMenuOptionNumberChooser ...

 ... instead of CStringInput to enter numbers

* neutrino.cpp: drop SetupTiming method
* system/settings: use integers for timing values#
* system/setting_helpers: drop CTimingSettingsNotifier
2013-12-22 21:13:45 +01:00
vanhofen
524f358446 osd-setup: fix 60e34434fd
Origin commit data
------------------
Commit: 4b4ef281a4
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-12-10 (Tue, 10 Dec 2013)

Origin message was:
------------------
- osd-setup: fix 60e34434fd
2013-12-10 03:02:44 +01:00
vanhofen
60e34434fd infoclock: add some features
* add shadow to infoclock
* rename some locals
* change default height of clock
* add option to switch bachground on/off (default off)
* add option to switch seconds on/off (default on)


Origin commit data
------------------
Commit: e97e33532b
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-12-10 (Tue, 10 Dec 2013)

Origin message was:
------------------
- infoclock: add some features

* add shadow to infoclock
* rename some locals
* change default height of clock
* add option to switch bachground on/off (default off)
* add option to switch seconds on/off (default on)
2013-12-10 02:38:43 +01:00
vanhofen
fb8daec3e1 osd-setup: add option to switch clock on or off
Origin commit data
------------------
Commit: 25b1b35872
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-12-10 (Tue, 10 Dec 2013)

Origin message was:
------------------
- osd-setup: add option to switch clock on or off
2013-12-10 02:22:27 +01:00
vanhofen
1f177c9522 infoclock: cleanup (remove unneeded stuff)
Origin commit data
------------------
Commit: 52f51e7f27
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-12-09 (Mon, 09 Dec 2013)

Origin message was:
------------------
- infoclock: cleanup (remove unneeded stuff)
2013-12-09 23:12:23 +01: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
Stefan Seyfried
963a1c795d Revert "Revert "global.h: Use forward-declarations to reduce number of dependencies""
This reverts commit d6c1108d7e.

No Idea why this was reverted, so revert again :-)


Origin commit data
------------------
Commit: bf8ec4d89e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-30 (Sat, 30 Nov 2013)
2013-11-30 18:26:47 +01:00
[CST] Focus
b5b51436fb gui/osd_setup.cpp: fix memleak
Origin commit data
------------------
Commit: 98fb57d924
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-29 (Fri, 29 Nov 2013)
2013-11-29 17:27:10 +04:00
Michael Liebmann
c9b42ca396 CInfoClock: Use dynamic font for display
Origin commit data
------------------
Commit: 435d25c0ce
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-11-27 (Wed, 27 Nov 2013)
2013-11-28 16:07:49 +01:00
vanhofen
d6c1108d7e Revert "global.h: Use forward-declarations to reduce number of dependencies"
This reverts commit f2a2e699c2.


Origin commit data
------------------
Commit: 3c8d47fa49
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)
2013-11-13 23:40:16 +01:00
Stefan Seyfried
f2a2e699c2 global.h: Use forward-declarations to reduce number of dependencies
Origin commit data
------------------
Commit: 4bc6e43ad4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)
2013-11-13 10:40:03 +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
martii
1000ab9237 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
------------------
Commit: 4eb66ba4b2
Author: martii <m4rtii@gmx.de>
Date: 2013-11-09 (Sat, 09 Nov 2013)
2013-11-09 17:03:03 +01:00
[CST] Focus
ead34415a6 gui/osd_setup.cpp: fix Window size in menu, snprintf take care about 0 at the end
Origin commit data
------------------
Commit: 4e423e2bd7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-07 (Thu, 07 Nov 2013)
2013-11-07 18:59:42 +04:00
[CST] Focus
1481149bd0 gui/osd_setup.cpp: add support to change window width and height,
use buttons up/down to change height, left/right to change width, page up/down to change both


Origin commit data
------------------
Commit: aaf9d3edf6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-07 (Thu, 07 Nov 2013)
2013-11-07 17:27:23 +04:00
Stefan Seyfried
158bd2c244 Merge branch 'check/next-cc'
Origin commit data
------------------
Commit: 50977ef2f5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-03 (Tue, 03 Sep 2013)
2013-09-03 09:36:49 +02:00
vanhofen
4bcbf90dc1 osd_setup: introduce g_settings.window_size to scale some windows
* remove g_settings.big_windows
* add setup window (use up/down to change size)


Origin commit data
------------------
Commit: 6ed30528f9
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-09-02 (Mon, 02 Sep 2013)

Origin message was:
------------------
- osd_setup: introduce g_settings.window_size to scale some windows

* remove g_settings.big_windows
* add setup window (use up/down to change size)
2013-09-02 20:59:26 +02: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
Michael Liebmann
af1608682d CNeutrinoFonts: Use separate font renderer for dynamic fonts
- delete / initialize font renderer only if necessary
 (e.g. start program, change the font file, change the scaling)


Origin commit data
------------------
Commit: e473df6a43
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)

Origin message was:
------------------
CNeutrinoFonts: Use separate font renderer for dynamic fonts

- delete / initialize font renderer only if necessary
 (e.g. start program, change the font file, change the scaling)
2013-07-26 14:52:37 +02:00
Michael Liebmann
af1f9a1e14 Add option to resize the VolumeBar
- Minimum height: Height of NEUTRINO_ICON_VOLUME + 2 pixels
- Maximum height: 50 pixels
- Setting can be changed with:
 Menu -> Settings -> OSD -> Volume -> Height of display


Origin commit data
------------------
Commit: 0a0035c2ae
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-29 (Sat, 29 Jun 2013)

Origin message was:
------------------
Add option to resize the VolumeBar

- Minimum height: Height of NEUTRINO_ICON_VOLUME + 2 pixels
- Maximum height: 50 pixels
- Setting can be changed with:
 Menu -> Settings -> OSD -> Volume -> Height of display
2013-07-21 22:06:05 +02:00
Michael Liebmann
09d3ccc359 Add new class CNeutrinoFonts for setup and modify neutrino fonts
- move SetupFonts() from CNeutrinoApp to CFontSetup


Origin commit data
------------------
Commit: 465d2aba23
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-27 (Thu, 27 Jun 2013)
2013-07-21 22:05:14 +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