Commit Graph

114 Commits

Author SHA1 Message Date
vanhofen
da5193b8c4 infoviewer: move showMovieTitle() below showTitle()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4568645abf
Author: vanhofen <vanhofen@gmx.de>
Date: 2024-10-25 (Fri, 25 Oct 2024)

Origin message was:
------------------
- infoviewer: move showMovieTitle() below showTitle()

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

------------------
This commit was generated by Migit
2024-10-25 19:20:02 +02:00
vanhofen
080406f912 infoviewer: an addition to e415a8feb2a652b634db25ca2cda5fb8f39ba5eb
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0c2e7fb3b0
Author: vanhofen <vanhofen@gmx.de>
Date: 2023-04-12 (Wed, 12 Apr 2023)

Origin message was:
------------------
- infoviewer: an addition to e415a8feb2a652b634db25ca2cda5fb8f39ba5eb

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

------------------
This commit was generated by Migit
2023-04-12 23:13:55 +02:00
Thilo Graf
f2f046f62e infoviewer: Updated naming convention to consistently indicate return values
'getter' methods do convey a return value,
but getLiveStreamInfo() returns nothing, therefore we should use
a more appropriate name, such as 'initialize'
or 'modify', improving code clarity and adherence
to best practices.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 16f0d6c6c5
Author: Thilo Graf <dbt@novatux.de>
Date: 2023-04-12 (Wed, 12 Apr 2023)



------------------
This commit was generated by Migit
2023-04-12 23:13:55 +02:00
vanhofen
6c81788047 infoviewer: rework get/showLivestreamInfo()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0fa97c893f
Author: vanhofen <vanhofen@gmx.de>
Date: 2023-03-26 (Sun, 26 Mar 2023)

Origin message was:
------------------
- infoviewer: rework get/showLivestreamInfo()

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

------------------
This commit was generated by Migit
2023-03-26 22:34:09 +02:00
vanhofen
e9be867002 Revert "- infoviewer: add slide (test only)"
This reverts commit 368963cf03d252903c6cdb3cd30b02508d32719a.


Origin commit data
------------------
Branch: ni/coolstream
Commit: c5b624288a
Author: vanhofen <vanhofen@gmx.de>
Date: 2022-11-23 (Wed, 23 Nov 2022)



------------------
This commit was generated by Migit
2022-11-23 23:54:02 +01:00
vanhofen
21b95fc437 infoviewer: add slide (test only)
Origin commit data
------------------
Branch: ni/coolstream
Commit: a5e8add178
Author: vanhofen <vanhofen@gmx.de>
Date: 2022-11-23 (Wed, 23 Nov 2022)

Origin message was:
------------------
- infoviewer: add slide (test only)

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

------------------
This commit was generated by Migit
2022-11-23 23:54:02 +01:00
vanhofen
c7b714377d infoviewer: minor cleanup
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6e769b11a1
Author: vanhofen <vanhofen@gmx.de>
Date: 2022-11-23 (Wed, 23 Nov 2022)

Origin message was:
------------------
- infoviewer: minor cleanup

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

------------------
This commit was generated by Migit
2022-11-23 23:54:02 +01:00
Thilo Graf
a401d4803e infoviewer: use widget for record info
This is replacing tasks inside showRecordIcon().


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2de81771c0
Author: Thilo Graf <dbt@novatux.de>
Date: 2022-01-20 (Thu, 20 Jan 2022)



------------------
This commit was generated by Migit
2022-01-20 21:24:37 +01:00
vanhofen
05b2fca409 infoviewer: add weather (inactive)
Origin commit data
------------------
Branch: ni/coolstream
Commit: e9fc84807f
Author: vanhofen <vanhofen@gmx.de>
Date: 2022-01-14 (Fri, 14 Jan 2022)

Origin message was:
------------------
- infoviewer: add weather (inactive)

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

------------------
This commit was generated by Migit
2022-01-14 22:43:24 +01:00
vanhofen
584c9c81e0 lcd4l: fix eventinfo for webtv/radio
commit based upon c1a45defc6


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5fc395712b
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-09-11 (Sat, 11 Sep 2021)

Origin message was:
------------------
- lcd4l: fix eventinfo for webtv/radio

commit based upon c1a45defc6


------------------
This commit was generated by Migit
2021-09-11 21:24:36 +02:00
vanhofen
e875b96269 lcd4l: show event in webtv/webradio mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: bb1086ab9d
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-09-30 (Wed, 30 Sep 2020)

Origin message was:
------------------
- lcd4l: show event in webtv/webradio mode

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

------------------
This commit was generated by Migit
2020-09-30 21:07:36 +02:00
Thilo Graf
a2ba794cbf radiotext: rework radiotext handling
Radiotext moved into a separate class and will be shown with screensaver.


Origin commit data
------------------
Branch: ni/coolstream
Commit: d995d2b8f8
Author: Thilo Graf <dbt@novatux.de>
Date: 2020-01-05 (Sun, 05 Jan 2020)



------------------
This commit was generated by Migit
2020-01-06 22:25:46 +01:00
vanhofen
23b553a97e cosmetics: align epg_id notation to channel_id
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4343c2d5da
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-04-27 (Sat, 27 Apr 2019)

Origin message was:
------------------
- cosmetics: align epg_id notation to channel_id

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

------------------
This commit was generated by Migit
2019-04-27 16:26:21 +02:00
Thilo Graf
bf4df77987 infobar timout: add member to get current timeout modes
Avoids multiple code in some source files.


Origin commit data
------------------
Branch: ni/coolstream
Commit: e0be304aef
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-04-10 (Tue, 10 Apr 2018)

Origin message was:
------------------
infobar timout: add member to get current timeout modes

Avoids multiple code in some source files.


------------------
This commit was generated by Migit
2018-04-10 22:30:17 +02:00
Stefan Seyfried
acdea13d8e reduce dependencies on driver/rcinput.h
* add new header that only contains neutrino_msg_t and friends, often this
 is all that's needed instead of full rcinput.h
* directly include rcinput.h in some cpp files instead of relying on
 accidental inclusion in some header
* add class forward declarations to avoid dragging in rcinput indirectly
This could use more work to further reduce the impact; maybe separating
the CRCinput::key_* constants from the rcinput class would be good.


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

Origin message was:
------------------
reduce dependencies on driver/rcinput.h

* add new header that only contains neutrino_msg_t and friends, often this
 is all that's needed instead of full rcinput.h
* directly include rcinput.h in some cpp files instead of relying on
 accidental inclusion in some header
* add class forward declarations to avoid dragging in rcinput indirectly
This could use more work to further reduce the impact; maybe separating
the CRCinput::key_* constants from the rcinput class would be good.


------------------
This commit was generated by Migit
2018-01-15 19:54:51 +01:00
vanhofen
82b4d09727 infoviewer: rename text_cur_* => text_curr_*
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2d01ac2aec
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-09 (Tue, 09 Jan 2018)

Origin message was:
------------------
- infoviewer: rename text_cur_* => text_curr_*

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

------------------
This commit was generated by Migit
2018-01-09 11:14:08 +01:00
vanhofen
d268025b61 infoviewer: rename txt_cur_event_rest => txt_cur_rest
Origin commit data
------------------
Branch: ni/coolstream
Commit: 041e08639a
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-09 (Tue, 09 Jan 2018)

Origin message was:
------------------
- infoviewer: rename txt_cur_event_rest => txt_cur_rest

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

------------------
This commit was generated by Migit
2018-01-09 11:14:08 +01:00
vanhofen
0dabed9bdb infoviewer: fix centering in numbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c166f8c5d
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-07 (Sun, 07 Jan 2018)

Origin message was:
------------------
- infoviewer: fix centering in numbox

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

------------------
This commit was generated by Migit
2018-01-07 20:23:41 +01:00
vanhofen
d81844d8ee infoviewer: cleanup from some unused code
Origin commit data
------------------
Branch: ni/coolstream
Commit: d039017aa7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-30 (Thu, 30 Nov 2017)

Origin message was:
------------------
- infoviewer: cleanup from some unused code

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

------------------
This commit was generated by Migit
2017-11-30 10:55:14 +01:00
vanhofen
0c71cc489f infoviewer: rework radiotext element; ...
use OFFSET defines, larger font, fix header width


Origin commit data
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2017-11-27 23:18:14 +01:00
vanhofen
5e5451332e Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/Makefile.am
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4a07c24174
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)



------------------
This commit was generated by Migit
2017-02-28 16:55:39 +01:00
vanhofen
bf56f9f0bc Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7829247fe8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)



------------------
This commit was generated by Migit
2017-02-28 15:36:23 +01:00
Michael Liebmann
7329fb6294 CInfoViewer::showTitle: Add parameter forcePaintButtonBar
Origin commit data
------------------
Branch: ni/coolstream
Commit: cc05d272f2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-28 (Tue, 28 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-28 15:04:09 +01:00
vanhofen
c80102a917 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
------------------
Branch: ni/coolstream
Commit: dd6244f33e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)



------------------
This commit was generated by Migit
2017-02-09 13:19:03 +01:00
vanhofen
54d7d92401 Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/epgview.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: e61a23cb74
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)



------------------
This commit was generated by Migit
2017-02-08 08:02:39 +01:00
Stefan Seyfried
86f609bc17 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
------------------
Branch: ni/coolstream
Commit: 2303d94300
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)



------------------
This commit was generated by Migit
2017-02-07 17:23:42 +01:00
vanhofen
af8fe3ebc6 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
------------------
Branch: ni/coolstream
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)



------------------
This commit was generated by Migit
2016-08-26 19:13:47 +02:00
Michael Liebmann
dd5f370fcc analogclock: Save background for using transparent clock images
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5d04ea65f4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-22 (Mon, 22 Aug 2016)


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

------------------
This commit was generated by Migit
2016-08-22 16:37:04 +02:00
Michael Liebmann
2c4ccf9555 Merge branch 'cst-next' into nmp-cst-next
- Fix merge conflicts


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)



------------------
This commit was generated by Migit
2016-08-19 17:40:48 +02:00
vanhofen
a86bc779b4 NI \o/
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)


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

------------------
This commit was generated by Migit
2016-05-19 22:59:54 +02:00
Michael Liebmann
f21a74ff57 Display of livestream infos in IV if no EPG data available
Origin commit data
------------------
Branch: ni/coolstream
Commit: eb1826ebee
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-03-03 (Thu, 03 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-03 09:46:42 +01:00
vanhofen
65838e4afd infoviewer: show movieplayers infoviewer in vzap mode if needed
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-02-04 00:14:57 +01:00
Michael Liebmann
6b1841a1b0 Merge branch 'cst-next' into nmp-cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: b6d2bad857
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-21 (Thu, 21 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-21 17:57:38 +01:00
Thilo Graf
db6be29b3f 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
------------------
Branch: ni/coolstream
Commit: 98b73c0d09
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-12 (Tue, 12 Jan 2016)



------------------
This commit was generated by Migit
2016-01-21 11:00:24 +01:00
Michael Liebmann
af2ffd931b Merge branch 'cst-next' into nmp-cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: f89463dc08
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-16 (Sat, 16 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-16 07:22:31 +01:00
vanhofen
adde9cbc2b infoviewer: some more little numbox-alignments
Origin commit data
------------------
Branch: ni/coolstream
Commit: 19d33dfb98
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-10 (Sun, 10 Jan 2016)

Origin message was:
------------------
- infoviewer: some more little numbox-alignments

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

------------------
This commit was generated by Migit
2016-01-10 21:57:59 +01:00
Stefan Seyfried
0a95a07654 Merge remote-tracking branch 'uncool/cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: b837d8697b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-28 (Mon, 28 Dec 2015)


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

------------------
This commit was generated by Migit
2015-12-28 16:15:14 +01:00
Thilo Graf
9f101bddbc Colors: init global color gradient implementation
Origin commit data
------------------
Branch: ni/coolstream
Commit: 523b273af8
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-11-19 (Thu, 19 Nov 2015)


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

------------------
This commit was generated by Migit
2015-12-27 14:42:27 +01:00
Stefan Seyfried
5f89c9a312 Merge remote-tracking branch 'uncool/cst-next'
This need buildfixes and some functional updates...


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



------------------
This commit was generated by Migit
2015-12-13 17:41:55 +01:00
vanhofen
09d2eb6e89 CInfoViewerBB: fix infobar ratio webtv
Signed-off-by: M. Liebmann <tuxcode.bbg@gmail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 45968b339d
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-10-19 (Mon, 19 Oct 2015)



------------------
This commit was generated by Migit
2015-10-21 12:31:04 +02:00
[CST] Focus
bceb57955d gui/infoviewer.cpp: remove some showTitle wrapper, use epg-id to get events
Origin commit data
------------------
Branch: ni/coolstream
Commit: 329aea09be
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-06-02 (Tue, 02 Jun 2015)


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

------------------
This commit was generated by Migit
2015-09-24 12:25:39 +03:00
vanhofen
c1c0c51126 infoviewer: add color-to-color gradient feature; THX to TangoCash ...
... for basic inspiration and dbt for some optimizations


Origin commit data
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2015-05-04 09:41:41 +02:00
Stefan Seyfried
2e4580b3fc infoviewer: simplify clock handling
Origin commit data
------------------
Branch: ni/coolstream
Commit: 08daae7852
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-03-27 (Fri, 27 Mar 2015)


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

------------------
This commit was generated by Migit
2015-03-27 13:27:22 +01:00
Stefan Seyfried
0877747c6c infoviewer: simplify clock handling
Origin commit data
------------------
Branch: ni/coolstream
Commit: b74cf816cb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-21 (Sat, 21 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-21 13:02:40 +01:00
Stefan Seyfried
105b4dd9e8 infoviewer.h: replace includes with forward declaration
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8fcaeda6a4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-11 (Wed, 11 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-14 14:31:12 +01:00
Stefan Seyfried
43f4d834ed infoviewer: use forward declaration instead of including infoviewer_bb
Origin commit data
------------------
Branch: ni/coolstream
Commit: 967f85eb5f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-14 14:31:11 +01:00
Stefan Seyfried
649465854d infoviewer.h: replace includes with forward declaration
Origin commit data
------------------
Branch: ni/coolstream
Commit: 51b15fbc1d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-11 (Wed, 11 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-11 08:41:27 +01:00
Stefan Seyfried
c92c77f7f4 infoviewer: use forward declaration instead of including infoviewer_bb
Origin commit data
------------------
Branch: ni/coolstream
Commit: ce5084ea52
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-10 15:38:21 +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