mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 08:51:04 +02:00
Code Issues Packages Projects Releases Wiki Activity
14,721 Commits 2 Branches 9 Tags
f1c074fc83c3b52840d83acfc683d3854ee4bed3
Commit Graph

1482 Commits

Author SHA1 Message Date
vanhofen
551555d7b7 vfd-setup: allow to set scroll_repeats if possible 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: dbf2fa3f18
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-13 (Mon, 13 Nov 2017)

Origin message was:
------------------
- vfd-setup: allow to set scroll_repeats if possible

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 20:39:34 +01:00
vanhofen
468d76f4b9 neutrino: display's setScrollMode() needs to be called on every start 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: bf88e2976f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-13 (Mon, 13 Nov 2017)

Origin message was:
------------------
- neutrino: display's setScrollMode() needs to be called on every start

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 20:39:34 +01:00
vanhofen
a557ba2b1a neutrino: avoid some ifdef's; prioritize proc filesystem 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 456c12dfb3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-13 (Mon, 13 Nov 2017)

Origin message was:
------------------
- neutrino: avoid some ifdef's; prioritize proc filesystem

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 20:39:34 +01:00
vanhofen
1a647a9c9e neutrino: fix console output to signalize timer wakeups 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: dc78eaf018
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-09 (Thu, 09 Nov 2017)

Origin message was:
------------------
- neutrino: fix console output to signalize timer wakeups

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 19:43:26 +01:00
vanhofen
bc9ef7cc77 neutrino: don't add web-channels to sat-bouquet 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 5bc21a6edd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-07 (Tue, 07 Nov 2017)

Origin message was:
------------------
- neutrino: don't add web-channels to sat-bouquet

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 19:43:26 +01:00
vanhofen
cf90f67818 neutrino: some more mode_radio/mode_webradio fixes #2 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 4202218b47
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)

Origin message was:
------------------
- neutrino: some more mode_radio/mode_webradio fixes #2

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 19:43:26 +01:00
vanhofen
93c8e3d193 neutrino: some more mode_radio/mode_webradio fixes 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: d84331689a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)

Origin message was:
------------------
- neutrino: some more mode_radio/mode_webradio fixes

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 19:43:26 +01:00
vanhofen
8608644900 neutrino: respect user's infoviewer timeout settings for different modes 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 942c6415c5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-05 (Sun, 05 Nov 2017)

Origin message was:
------------------
- neutrino: respect user's infoviewer timeout settings for different modes

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 19:43:26 +01:00
vanhofen
1962d8feb9 try to fix tv <-> radio switch 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 6259467ac8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- try to fix tv <-> radio switch

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 19:43:26 +01:00
vanhofen
875a7b720b rename LIST_MODE_WEBTV => LIST_MODE_WEB 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 0b78ac9e3f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- rename LIST_MODE_WEBTV => LIST_MODE_WEB

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 19:43:26 +01:00
vanhofen
ab30c38463 rename IS_WEBTV => IS_WEBCHAN 
Conflicts:
	src/zapit/src/capmt.cpp

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


Origin commit data
------------------
Commit: 740fd3ac0d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- rename IS_WEBTV => IS_WEBCHAN

 Conflicts:
	src/zapit/src/capmt.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 19:43:26 +01:00
vanhofen
5689d19646 fix mode in SetChannelMode() 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 8d3f2ce860
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- fix mode in SetChannelMode()

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 19:43:26 +01:00
vanhofen
7a4b625567 fix -Wlogical-op errors 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: a65a63982d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- fix -Wlogical-op errors

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 19:43:26 +01:00
vanhofen
ba98bb87f5 add webradio; first steps 
Conflicts:
	data/Makefile.am
	data/scripts/backup.sh
	src/neutrino.cpp
	src/zapit/include/zapit/zapit.h

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


Origin commit data
------------------
Commit: 3fd544737a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- add webradio; first steps

 Conflicts:
	data/Makefile.am
	data/scripts/backup.sh
	src/neutrino.cpp
	src/zapit/include/zapit/zapit.h

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 19:43:26 +01:00
vanhofen
f13b4b073b neutrino: don't load webradio xml on HD1 hardware; ... 
audiostreams doesn't work


Origin commit data
------------------
Commit: 702fc04178
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-15 (Wed, 15 Nov 2017)

Origin message was:
------------------
- neutrino: don't load webradio xml on HD1 hardware; ...

audiostreams doesn't work
 2017-11-15 13:34:43 +01:00
vanhofen
6f4f96f06e neutrino: add "need_reboot" feature 
Origin commit data
------------------
Commit: f6253de913
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-14 (Tue, 14 Nov 2017)

Origin message was:
------------------
- neutrino: add "need_reboot" feature
 2017-11-14 22:43:39 +01:00
vanhofen
d446c4187c vfd-setup: allow to set scroll_repeats if possible 
Origin commit data
------------------
Commit: 19ac5b0f0a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-13 (Mon, 13 Nov 2017)

Origin message was:
------------------
- vfd-setup: allow to set scroll_repeats if possible
 2017-11-13 22:47:11 +01:00
vanhofen
d917f145b3 neutrino: display's setScrollMode() needs to be called on every start 
Origin commit data
------------------
Commit: ac4083eda4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-13 (Mon, 13 Nov 2017)

Origin message was:
------------------
- neutrino: display's setScrollMode() needs to be called on every start
 2017-11-13 21:17:37 +01:00
vanhofen
480769f8b8 neutrino: avoid some ifdef's; prioritize proc filesystem 
Origin commit data
------------------
Commit: 268408d12b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-13 (Mon, 13 Nov 2017)

Origin message was:
------------------
- neutrino: avoid some ifdef's; prioritize proc filesystem
 2017-11-13 21:17:36 +01:00
TangoCash
d3e1d344c5 hd51: fix wakeup from standby 
Origin commit data
------------------
Commit: c4a59375b3
Author: TangoCash <eric@loxat.de>
Date: 2017-11-09 (Thu, 09 Nov 2017)
 2017-11-13 21:08:58 +01:00
vanhofen
0f26df2279 neutrino: fix console output to signalize timer wakeups 
Origin commit data
------------------
Commit: f9377d620c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-09 (Thu, 09 Nov 2017)

Origin message was:
------------------
- neutrino: fix console output to signalize timer wakeups
 2017-11-09 21:28:47 +01:00
TangoCash
cca109a84b hd51: fix wakeup from standby 
Origin commit data
------------------
Commit: a67d2e81c9
Author: TangoCash <eric@loxat.de>
Date: 2017-11-09 (Thu, 09 Nov 2017)
 2017-11-09 21:28:47 +01:00
vanhofen
9313d21bb8 neutrino: don't add web-channels to sat-bouquet 
Origin commit data
------------------
Commit: 57f3f6ea40
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-07 (Tue, 07 Nov 2017)

Origin message was:
------------------
- neutrino: don't add web-channels to sat-bouquet
 2017-11-07 07:51:08 +01:00
vanhofen
7cd7b2dc8e neutrino: some more mode_radio/mode_webradio fixes #2 
Origin commit data
------------------
Commit: 5b6d3ea78e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)

Origin message was:
------------------
- neutrino: some more mode_radio/mode_webradio fixes #2
 2017-11-06 00:00:31 +01:00
vanhofen
a8ce7a6cde neutrino: some more mode_radio/mode_webradio fixes 
Origin commit data
------------------
Commit: b025f8abb7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)

Origin message was:
------------------
- neutrino: some more mode_radio/mode_webradio fixes
 2017-11-06 00:00:31 +01:00
vanhofen
8d2c9fcf56 neutrino: respect user's infoviewer timeout settings for different modes 
Origin commit data
------------------
Commit: f736dfa254
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-05 (Sun, 05 Nov 2017)

Origin message was:
------------------
- neutrino: respect user's infoviewer timeout settings for different modes
 2017-11-05 22:10:30 +01:00
Jacek Jendrzej
5c5e1b0603 remove unused 
Origin commit data
------------------
Commit: 39440333e8
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 10:22:11 +01:00
vanhofen
00653d3f8a try to fix tv <-> radio switch 
Origin commit data
------------------
Commit: e105155830
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- try to fix tv <-> radio switch
 2017-11-03 09:36:20 +01:00
vanhofen
b5448a9e90 rename LIST_MODE_WEBTV => LIST_MODE_WEB 
Origin commit data
------------------
Commit: cd5577e8b5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- rename LIST_MODE_WEBTV => LIST_MODE_WEB
 2017-11-03 09:36:19 +01:00
vanhofen
268e94d9e3 rename IS_WEBTV => IS_WEBCHAN 
Origin commit data
------------------
Commit: ebcd15da41
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- rename IS_WEBTV => IS_WEBCHAN
 2017-11-03 09:36:19 +01:00
vanhofen
73764d9de0 fix mode in SetChannelMode() 
Origin commit data
------------------
Commit: 4ad5798e48
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- fix mode in SetChannelMode()
 2017-11-03 09:36:19 +01:00
vanhofen
cfe55074b3 fix -Wlogical-op errors 
Origin commit data
------------------
Commit: fe487f3976
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- fix -Wlogical-op errors
 2017-11-03 09:36:19 +01:00
vanhofen
560bcc7221 add webradio; first steps 
Origin commit data
------------------
Commit: a8b0fee599
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- add webradio; first steps
 2017-11-03 09:36:19 +01:00
vanhofen
435f29a53d neutrino: avoid double setMuted() call; already done by g_audioMute->AudioMute() 
Origin commit data
------------------
Commit: 0283b4d2d5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-30 (Mon, 30 Oct 2017)

Origin message was:
------------------
- neutrino: avoid double setMuted() call; already done by g_audioMute->AudioMute()
 2017-10-30 01:44:01 +01:00
vanhofen
8d7605f6e4 neutrino: don't show volume on startup and on resume 
Origin commit data
------------------
Commit: 2660629730
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-30 (Mon, 30 Oct 2017)

Origin message was:
------------------
- neutrino: don't show volume on startup and on resume
 2017-10-30 01:44:01 +01:00
TangoCash
25164c9c50 modify autocreate HD _and_ UHD channels as seperate lists 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 9c12ce65aa
Author: TangoCash <eric@loxat.de>
Date: 2017-10-20 (Fri, 20 Oct 2017)
 2017-10-29 18:33:58 +01:00
vanhofen
284138fbc5 audio_select: copy full code from TangoCash 
Just compile tested. Maybe some more alignments needed.

Signed-off-by: Thilo Graf <dbt@novatux.de>
Additional changes on cs playback_cs.h, because broken build
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 5fd7ec68ac
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)

Origin message was:
------------------
- audio_select: copy full code from TangoCash

Just compile tested. Maybe some more alignments needed.

Signed-off-by: Thilo Graf <dbt@novatux.de>
Additional changes on cs playback_cs.h, because broken build
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-10-29 18:32:30 +01:00
vanhofen
f8d931aad8 add hd51; mostly ported from TangoCash's neutrino-mp 
Origin commit data
------------------
Commit: 6fe5d269af
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-05 (Thu, 05 Oct 2017)

Origin message was:
------------------
- add hd51; mostly ported from TangoCash's neutrino-mp
 2017-10-29 18:31:30 +01:00
vanhofen
5184a08a5e neutrino: create users PUBLIC_HTTPDDIR automatically 
Origin commit data
------------------
Commit: 0f162e0761
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-28 (Sat, 28 Oct 2017)

Origin message was:
------------------
- neutrino: create users PUBLIC_HTTPDDIR automatically
 2017-10-28 23:36:08 +02:00
vanhofen
5e05b7aed3 multiformat audioplayer: add separate timeout for infobar 
Origin commit data
------------------
Commit: f945a9b127
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-28 (Sat, 28 Oct 2017)

Origin message was:
------------------
- multiformat audioplayer: add separate timeout for infobar
 2017-10-28 19:13:46 +02:00
vanhofen
36f78a8901 fix RC_tv/RC_radio handling; ... 
if we have separate keys for that we don't need to switch mode


Origin commit data
------------------
Commit: 1be1a64fcd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-28 (Sat, 28 Oct 2017)

Origin message was:
------------------
- fix RC_tv/RC_radio handling; ...

if we have separate keys for that we don't need to switch mode
 2017-10-28 14:18:09 +02:00
vanhofen
affa06d60b rcinput: add KEY_PROGRAM 
Origin commit data
------------------
Commit: 282db3025a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-27 (Fri, 27 Oct 2017)

Origin message was:
------------------
- rcinput: add KEY_PROGRAM
 2017-10-27 23:43:44 +02:00
gixxpunk
57ee10ee78 fix merge 
Origin commit data
------------------
Commit: 311714f54b
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-10-21 (Sat, 21 Oct 2017)

Origin message was:
------------------
- fix merge
 2017-10-21 15:04:00 +02:00
gixxpunk
a899930ccd Merge branch 'ni/tuxbox' of bitbucket.org:neutrino-images/ni-neutrino-hd into ni/mp/tuxbox 
Origin commit data
------------------
Commit: e18eb56492
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-10-21 (Sat, 21 Oct 2017)
 2017-10-21 14:54:59 +02:00
gixxpunk
88a674910a fix crash on init 
Origin commit data
------------------
Commit: 549422d431
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-10-21 (Sat, 21 Oct 2017)

Origin message was:
------------------
- fix crash on init
 2017-10-21 10:51:15 +02:00
TangoCash
589b8485da modify autocreate HD _and_ UHD channels as seperate lists 
Origin commit data
------------------
Commit: ec7f5e9b98
Author: TangoCash <eric@loxat.de>
Date: 2017-10-20 (Fri, 20 Oct 2017)
 2017-10-20 08:02:09 +02:00
vanhofen
9d1691fb8d Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	configure.ac
	data/locale/english.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/plugins.h
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: 20d546e42f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-18 (Wed, 18 Oct 2017)
 2017-10-18 09:53:55 +02:00
vanhofen
904003dede Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	configure.ac
	data/icons/buttons/0.png
	data/icons/buttons/1.png
	data/icons/buttons/2.png
	data/icons/buttons/3.png
	data/icons/buttons/4.png
	data/icons/buttons/5.png
	data/icons/buttons/6.png
	data/icons/buttons/7.png
	data/icons/buttons/8.png
	data/icons/buttons/9.png
	data/icons/buttons/blau.png
	data/icons/buttons/btn_backward.png
	data/icons/buttons/btn_forward.png
	data/icons/buttons/btn_pause.png
	data/icons/buttons/btn_play.png
	data/icons/buttons/btn_record_active.png
	data/icons/buttons/btn_record_inactive.png
	data/icons/buttons/btn_stop.png
	data/icons/buttons/down.png
	data/icons/buttons/gelb.png
	data/icons/buttons/gruen.png
	data/icons/buttons/help.png
	data/icons/buttons/help_small.png
	data/icons/buttons/home.png
	data/icons/buttons/info.png
	data/icons/buttons/info_small.png
	data/icons/buttons/left.png
	data/icons/buttons/menu.png
	data/icons/buttons/menu_small.png
	data/icons/buttons/mute_small.png
	data/icons/buttons/mute_zap_gray.png
	data/icons/buttons/mute_zap_green.png
	data/icons/buttons/ok.png
	data/icons/buttons/power.png
	data/icons/buttons/right.png
	data/icons/buttons/rot.png
	data/icons/buttons/up.png
	data/icons/filetypes/movie.png
	data/icons/filetypes/mp3.png
	data/icons/headers/audio.png
	data/icons/headers/bookmarkmanager.png
	data/icons/headers/colors.png
	data/icons/headers/error.png
	data/icons/headers/features.png
	data/icons/headers/games.png
	data/icons/headers/icon_blue.png
	data/icons/headers/icon_green.png
	data/icons/headers/icon_red.png
	data/icons/headers/icon_yellow.png
	data/icons/headers/information.png
	data/icons/headers/keybinding.png
	data/icons/headers/language.png
	data/icons/headers/lcd.png
	data/icons/headers/mainmenue.png
	data/icons/headers/multimedia.png
	data/icons/headers/network.png
	data/icons/headers/personalize.png
	data/icons/headers/shell.png
	data/icons/headers/softupdate.png
	data/icons/headers/streaming.png
	data/icons/headers/timer.png
	data/icons/headers/upnp.png
	data/icons/headers/video.png
	data/icons/movieplayer/mp_b-skip.png
	data/icons/movieplayer/mp_f-skip.png
	data/icons/movieplayer/mp_pause.png
	data/icons/movieplayer/mp_play.png
	data/icons/movieplayer/mp_play_repeat_all.png
	data/icons/movieplayer/mp_play_repeat_track.png
	data/icons/status/ca/biss_green.png
	data/icons/status/ca/biss_white.png
	data/icons/status/ca/biss_yellow.png
	data/icons/status/ca/conax_green.png
	data/icons/status/ca/conax_white.png
	data/icons/status/ca/conax_yellow.png
	data/icons/status/ca/cw_green.png
	data/icons/status/ca/cw_white.png
	data/icons/status/ca/cw_yellow.png
	data/icons/status/ca/d_green.png
	data/icons/status/ca/d_white.png
	data/icons/status/ca/d_yellow.png
	data/icons/status/ca/ird_green.png
	data/icons/status/ca/ird_white.png
	data/icons/status/ca/ird_yellow.png
	data/icons/status/ca/nagra_green.png
	data/icons/status/ca/nagra_white.png
	data/icons/status/ca/nagra_yellow.png
	data/icons/status/ca/nds_green.png
	data/icons/status/ca/nds_white.png
	data/icons/status/ca/nds_yellow.png
	data/icons/status/ca/powervu_green.png
	data/icons/status/ca/powervu_white.png
	data/icons/status/ca/powervu_yellow.png
	data/icons/status/ca/seca_green.png
	data/icons/status/ca/seca_white.png
	data/icons/status/ca/seca_yellow.png
	data/icons/status/ca/via_green.png
	data/icons/status/ca/via_white.png
	data/icons/status/ca/via_yellow.png
	data/icons/status/ca/x_green.png
	data/icons/status/ca/x_white.png
	data/icons/status/ca/x_yellow.png
	data/icons/status/channel/16_9.png
	data/icons/status/channel/16_9_gray.png
	data/icons/status/channel/ca2.png
	data/icons/status/channel/ca2_gray.png
	data/icons/status/channel/dd.png
	data/icons/status/channel/dd_avail.png
	data/icons/status/channel/dd_gray.png
	data/icons/status/channel/radiotextget.png
	data/icons/status/channel/radiotextoff.png
	data/icons/status/channel/radiotextwait.png
	data/icons/status/channel/res_000.png
	data/icons/status/channel/res_1080.png
	data/icons/status/channel/res_1280.png
	data/icons/status/channel/res_1440.png
	data/icons/status/channel/res_1920.png
	data/icons/status/channel/res_288.png
	data/icons/status/channel/res_352.png
	data/icons/status/channel/res_382.png
	data/icons/status/channel/res_480.png
	data/icons/status/channel/res_528.png
	data/icons/status/channel/res_544.png
	data/icons/status/channel/res_576.png
	data/icons/status/channel/res_704.png
	data/icons/status/channel/res_720.png
	data/icons/status/channel/res_hd.png
	data/icons/status/channel/res_sd.png
	data/icons/status/channel/subt.png
	data/icons/status/channel/subt_gray.png
	data/icons/status/channel/tuner_1.png
	data/icons/status/channel/tuner_2.png
	data/icons/status/channel/tuner_3.png
	data/icons/status/channel/tuner_4.png
	data/icons/status/channel/vtxt.png
	data/icons/status/channel/vtxt_gray.png
	data/icons/status/various/ats.png
	data/icons/status/various/ats_gray.png
	data/icons/status/various/ca.png
	data/icons/status/various/lock.png
	data/icons/status/various/mounted.png
	data/icons/status/various/mute.png
	data/icons/status/various/not_mounted.png
	data/icons/status/various/pip.png
	data/icons/status/various/rec_event_marker.png
	data/icons/status/various/rec_gray.png
	data/icons/status/various/zap.png
	data/locale/Makefile.am
	data/locale/english.locale
	data/pictures/backgrounds/1280x720/start.jpg
	src/driver/fb_accel_sti.cpp
	src/gui/Makefile.am
	src/gui/dboxinfo.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/system/settings.cpp
	src/system/settings.h


Origin commit data
------------------
Commit: 4121099dcf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-18 (Wed, 18 Oct 2017)
 2017-10-18 09:41:46 +02:00
Thilo Graf
fcd9d06d45 Merge branch 'pu/mp' into 'master' 
Origin commit data
------------------
Commit: ccb19a8880
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-17 (Tue, 17 Oct 2017)
 2017-10-17 20:38:58 +02:00
Thilo Graf
cdc251da82 neutrino.cpp: show logo on start up 
Origin commit data
------------------
Commit: 54750e49b7
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-16 (Mon, 16 Oct 2017)
 2017-10-17 20:02:45 +02:00