Commit Graph

12976 Commits

Author SHA1 Message Date
max_10
71320a28d7 ffmpegdec: fix audio playback for ARM_HARDWARE
Origin commit data
------------------
Branch: ni/coolstream
Commit: 647a69c0cf
Author: max_10 <max_10@gmx.de>
Date: 2017-11-30 (Thu, 30 Nov 2017)

Origin message was:
------------------
- ffmpegdec: fix audio playback for ARM_HARDWARE

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

------------------
This commit was generated by Migit
2017-11-30 12:38:40 +01:00
vanhofen
f7b1c91039 infoviewer: avoid display of radiotext icon in virtual zap mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: a38e827010
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-30 (Thu, 30 Nov 2017)

Origin message was:
------------------
- infoviewer: avoid display of radiotext icon in virtual zap mode

------------------
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
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
644acc78f2 infoviewer_bb: fix offset for first status-icon
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1751a00cc3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-29 (Wed, 29 Nov 2017)

Origin message was:
------------------
- infoviewer_bb: fix offset for first status-icon

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

------------------
This commit was generated by Migit
2017-11-29 10:47:34 +01:00
vanhofen
b3d262b045 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/zapit/src/frontend.cpp


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



------------------
This commit was generated by Migit
2017-11-29 09:51:59 +01:00
vanhofen
eb616062fa infoviewer_bb: use OFFSET defines; ...
height of ca-bar now depends on height of ca-icons
cleanup from commented code


Origin commit data
------------------
Branch: ni/coolstream
Commit: 866a2c3a4a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-28 (Tue, 28 Nov 2017)

Origin message was:
------------------
- infoviewer_bb: use OFFSET defines; ...

height of ca-bar now depends on height of ca-icons
cleanup from commented code


------------------
This commit was generated by Migit
2017-11-28 14:41:42 +01:00
vanhofen
2a29fa67eb infoviewer_bb: take footer height from CComponentsFooter ...
to get this footer in sync with the footers of other gui elements


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e4b0023ab
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-28 (Tue, 28 Nov 2017)

Origin message was:
------------------
- infoviewer_bb: take footer height from CComponentsFooter ...

to get this footer in sync with the footers of other gui elements


------------------
This commit was generated by Migit
2017-11-28 14:41:42 +01:00
vanhofen
df6e7f7f37 zapit/frontend: fix compiler warning
Origin commit data
------------------
Branch: ni/coolstream
Commit: 79bad6babd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- zapit/frontend: fix compiler warning

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

------------------
This commit was generated by Migit
2017-11-28 10:52:01 +01:00
TangoCash
c40d92c210 frontend: fix fall through
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6f1a7638eb
Author: TangoCash <eric@loxat.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-28 10:52:01 +01:00
TangoCash
3bc3be1b03 add DVB-T2 support, enable 5V supply
Origin commit data
------------------
Branch: ni/coolstream
Commit: e4bdd4700d
Author: TangoCash <eric@loxat.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-28 10:52:01 +01:00
Jacek Jendrzej
774ea34a27 prepare for T2 patch
Origin commit data
------------------
Branch: ni/coolstream
Commit: ff4a17e387
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-28 (Tue, 28 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-28 10:52:01 +01:00
vanhofen
a0cce78210 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	configure.ac
	data/icons/buttons/btn_record_active.png
	data/icons/buttons/gelb.png
	data/icons/buttons/gruen.png
	data/icons/buttons/rot.png
	data/icons/headers/icon_green.png
	data/icons/headers/icon_red.png
	data/icons/headers/icon_yellow.png
	data/icons/status/various/lock.png
	data/pictures/backgrounds/1280x720/shutdown.jpg
	data/pictures/backgrounds/1280x720/start.jpg
	src/driver/streamts.cpp
	src/gui/plugins.h
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 74aab8ddd2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-28 (Tue, 28 Nov 2017)



------------------
This commit was generated by Migit
2017-11-28 10:31:10 +01:00
vanhofen
4f3a9f7245 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Conflicts:
	src/neutrino.cpp
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3dc600766a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-28 (Tue, 28 Nov 2017)



------------------
This commit was generated by Migit
2017-11-28 10:23:12 +01:00
vanhofen
7be4957745 usermenu: cleanup from ITEM_RASS
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5e7472e96b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- usermenu: cleanup from ITEM_RASS

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

------------------
This commit was generated by Migit
2017-11-27 23:24:55 +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
TangoCash
cdc16f90cc fix AAC record and playback
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: edee40e2a6
Author: TangoCash <eric@loxat.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)



------------------
This commit was generated by Migit
2017-11-27 22:28:12 +01:00
vanhofen
9a75d8cb5e zapit: remove some ifdef's; prepare for upcoming patches
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: e6e27d291c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- zapit: remove some ifdef's; prepare for upcoming patches

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-11-27 22:27:09 +01:00
vanhofen
72f64ec7fa neutrino: don't write timerinfo's when exiting to reboot
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 37028e518b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-26 (Sun, 26 Nov 2017)

Origin message was:
------------------
- neutrino: don't write timerinfo's when exiting to reboot

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-11-27 22:26:30 +01:00
vanhofen
665849c44e neutrino: re-disable screensaver for mode_webradio on ARM_HARDWARE
when screensaver is stopped the playback is stopped too

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 25c8220888
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- neutrino: re-disable screensaver for mode_webradio on ARM_HARDWARE

when screensaver is stopped the playback is stopped too

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-11-27 22:25:23 +01:00
vanhofen
10351f8d91 screensaver: move more repeatedly used code to screensaver's code
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 81b82668ac
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- screensaver: move more repeatedly used code to screensaver's code

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-11-27 22:23:32 +01:00
vanhofen
d77f9b5f06 movieplayer: use members from screensaver's code
Conflicts:
	src/gui/movieplayer.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: c963587a0f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- movieplayer: use members from screensaver's code

 Conflicts:
	src/gui/movieplayer.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-11-27 22:22:57 +01:00
vanhofen
6dba4ae47d neutrino: move screensaver members to screensaver's code
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 74bc2e88d5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- neutrino: move screensaver members to screensaver's code

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-11-27 20:38:38 +01:00
vanhofen
7567d4e27d neutrino: enable screensaver for mode_webradio
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 962bcae745
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- neutrino: enable screensaver for mode_webradio

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-11-27 20:38:07 +01:00
vanhofen
4a9bb5b77b shutdown_helper: better explanation of what the tool does; ...
small code re-formatting

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: c5b6543dee
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- shutdown_helper: better explanation of what the tool does; ...

small code re-formatting

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-11-27 20:37:27 +01:00
vanhofen
6dcd5baf4c radiotext: cleanup from tons of unused code; rass is dead
Origin commit data
------------------
Branch: ni/coolstream
Commit: e8bb447fcf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- radiotext: cleanup from tons of unused code; rass is dead

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

------------------
This commit was generated by Migit
2017-11-27 16:47:50 +01:00
vanhofen
7a0dc09bef icons: cleanup from unused icons
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1c638ba13d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- icons: cleanup from unused icons

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

------------------
This commit was generated by Migit
2017-11-27 16:04:43 +01:00
vanhofen
0e4d8aedc9 icons.h: cleanup from unused defines
Origin commit data
------------------
Branch: ni/coolstream
Commit: 811fcbe2d8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- icons.h: cleanup from unused defines

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

------------------
This commit was generated by Migit
2017-11-27 16:04:43 +01:00
vanhofen
70691d8f49 remove unused src/driver/stacktrace.h; use src/system/stacktrace.h if needed
Origin commit data
------------------
Branch: ni/coolstream
Commit: 52b0f6c27e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- remove unused src/driver/stacktrace.h; use src/system/stacktrace.h if needed

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

------------------
This commit was generated by Migit
2017-11-27 14:16:38 +01:00
vanhofen
4e895c861f neutrino: try to fix timer_wakeup handling; ...
The return to deepstandby after timer-wakeups was broken.


Origin commit data
------------------
Branch: ni/coolstream
Commit: a063b370aa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- neutrino: try to fix timer_wakeup handling; ...

The return to deepstandby after timer-wakeups was broken.


------------------
This commit was generated by Migit
2017-11-27 12:50:53 +01:00
TangoCash
042d233b33 frontend: fix fall through
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2360934df2
Author: TangoCash <eric@loxat.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-27 10:32:55 +01:00
vanhofen
84b070de4e zapit/frontend: fix compiler warning
Origin commit data
------------------
Branch: ni/coolstream
Commit: ef0f1eedf8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- zapit/frontend: fix compiler warning

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

------------------
This commit was generated by Migit
2017-11-27 10:22:52 +01:00
vanhofen
ee8b39dd7d locale: minor changes on new tunersetup locales
Origin commit data
------------------
Branch: ni/coolstream
Commit: 090fcd4e54
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- locale: minor changes on new tunersetup locales

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

------------------
This commit was generated by Migit
2017-11-27 10:22:52 +01:00
TangoCash
5a48b632ca add DVB-T2 support, enable 5V supply
Origin commit data
------------------
Branch: ni/coolstream
Commit: 91379feece
Author: TangoCash <eric@loxat.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-27 10:22:52 +01:00
TangoCash
eac8f5ec78 fix AAC record and playback
Origin commit data
------------------
Branch: ni/coolstream
Commit: e5a4a53720
Author: TangoCash <eric@loxat.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-27 10:22:52 +01:00
vanhofen
ed88b1af0a zapit: remove some ifdef's; prepare for upcoming patches
Origin commit data
------------------
Branch: ni/coolstream
Commit: 37cbd7c5e6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- zapit: remove some ifdef's; prepare for upcoming patches

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

------------------
This commit was generated by Migit
2017-11-27 10:22:52 +01:00
vanhofen
7fe919e215 neutrino: don't write timerinfo's when exiting to reboot
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9c53be06d5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-26 (Sun, 26 Nov 2017)

Origin message was:
------------------
- neutrino: don't write timerinfo's when exiting to reboot

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

------------------
This commit was generated by Migit
2017-11-26 23:29:43 +01:00
Stefan Seyfried
e204dee9d3 de-saturize color buttons a bit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 241ea9d46e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-11-26 (Sun, 26 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-26 18:44:54 +01:00
Stefan Seyfried
8b07e0e0ca restore start and shutdown pictures after merge
Origin commit data
------------------
Branch: ni/coolstream
Commit: 60ff2da2ab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-11-26 (Sun, 26 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-26 17:41:42 +01:00
vanhofen
a89e257f90 cablex.xml: add OstTelCom; thx to elstablo
http://www.neutrino-images.de/board/viewtopic.php?f=28&t=2125#p12037
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8cefe9a1d5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- cablex.xml: add OstTelCom; thx to elstablo

http://www.neutrino-images.de/board/viewtopic.php?f=28&t=2125#p12037
Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-11-25 21:20:24 +01:00
vanhofen
6ca6125cb9 neutrino: re-disable screensaver for mode_webradio on ARM_HARDWARE
when screensaver is stopped the playback is stopped too


Origin commit data
------------------
Branch: ni/coolstream
Commit: c409630993
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- neutrino: re-disable screensaver for mode_webradio on ARM_HARDWARE

when screensaver is stopped the playback is stopped too


------------------
This commit was generated by Migit
2017-11-25 09:58:55 +01:00
vanhofen
246fb806f7 mediaplayer: disable fileplayback audio for coolstream; that doesn't work
Origin commit data
------------------
Branch: ni/coolstream
Commit: 66979ea916
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- mediaplayer: disable fileplayback audio for coolstream; that doesn't work

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

------------------
This commit was generated by Migit
2017-11-25 09:58:55 +01:00
vanhofen
53186bb33d screensaver: move more repeatedly used code to screensaver's code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c1058382f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- screensaver: move more repeatedly used code to screensaver's code

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

------------------
This commit was generated by Migit
2017-11-25 09:58:55 +01:00
vanhofen
388904cea2 movieplayer: use members from screensaver's code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 668d29790c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- movieplayer: use members from screensaver's code

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

------------------
This commit was generated by Migit
2017-11-25 09:58:55 +01:00
vanhofen
1d0ccd2e0e neutrino: move screensaver members to screensaver's code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8a08024e9c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- neutrino: move screensaver members to screensaver's code

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

------------------
This commit was generated by Migit
2017-11-25 09:58:55 +01:00
vanhofen
8da02eefab neutrino: enable screensaver for mode_webradio
Origin commit data
------------------
Branch: ni/coolstream
Commit: e55fc416f7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- neutrino: enable screensaver for mode_webradio

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

------------------
This commit was generated by Migit
2017-11-25 09:58:55 +01:00
vanhofen
38807b8fc2 shutdown_helper: better explanation of what the tool does; ...
small code re-formatting


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9312a3f91a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- shutdown_helper: better explanation of what the tool does; ...

small code re-formatting


------------------
This commit was generated by Migit
2017-11-25 09:58:55 +01:00
vanhofen
94431118a8 webtv-setup: clearify hint for autoload item
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9b53d11357
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- webtv-setup: clearify hint for autoload item

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

------------------
This commit was generated by Migit
2017-11-25 09:58:55 +01:00
vanhofen
59d2024bc6 webtv-setup: just fix indentation
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3d6eb97eaf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- webtv-setup: just fix indentation

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

------------------
This commit was generated by Migit
2017-11-25 09:58:55 +01:00
vanhofen
382a5001a0 cablex.xml: add OstTelCom; thx to elstablo
http://www.neutrino-images.de/board/viewtopic.php?f=28&t=2125#p12037


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9f5e61b366
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- cablex.xml: add OstTelCom; thx to elstablo

http://www.neutrino-images.de/board/viewtopic.php?f=28&t=2125#p12037


------------------
This commit was generated by Migit
2017-11-25 09:57:15 +01:00
vanhofen
7f33625bea Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d88b539ca
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-24 (Fri, 24 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-24 11:12:41 +01:00