mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity
13,190 Commits 2 Branches 9 Tags
8c24feb848fd6183e204d96626e20cdd007d583b
Commit Graph

7707 Commits

Author SHA1 Message Date
vanhofen
5819caa3a9 hdd-menu: hide mmcblk devices from hdd-menu 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 20d3cd3d2a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-07 (Sat, 07 Oct 2017)

Origin message was:
------------------
- hdd-menu: hide mmcblk devices from hdd-menu

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-10-29 21:29:50 +01:00
Thilo Graf
59c07e5163 CScreenShot: fix build 
Some lines were wrong picked


Origin commit data
------------------
Commit: b26fc7fb8d
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-27 (Fri, 27 Oct 2017)
 2017-10-29 18:48:28 +01:00
vanhofen
e6b09619c9 update: allow online-update for AX/Mutant; add some beautiful ifdef's 
Signed-off-by: Thilo Graf <dbt@novatux.de>
#ifdefs not really beautiful but sometimes inevitable


Origin commit data
------------------
Commit: ba126c3a2c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-23 (Mon, 23 Oct 2017)

Origin message was:
------------------
- update: allow online-update for AX/Mutant; add some beautiful ifdef's

Signed-off-by: Thilo Graf <dbt@novatux.de>
#ifdefs not really beautiful but sometimes inevitable
 2017-10-29 18:37:40 +01:00
vanhofen
95813b4b65 update: allow tgz-tarballs for update via ofgwrite 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 7e974bc716
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-21 (Sat, 21 Oct 2017)

Origin message was:
------------------
- update: allow tgz-tarballs for update via ofgwrite

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-10-29 18:34:24 +01:00
vanhofen
b63a225088 let playback handle devices 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: b9ed20ac53
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-15 (Sun, 15 Oct 2017)
 2017-10-29 18:33:05 +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
TangoCash
ba243eca6e fix resolution icon in infoviewer 
Origin commit data
------------------
Commit: 6a1b0c1c73
Author: TangoCash <eric@loxat.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)
 2017-10-29 18:31:56 +01:00
TangoCash
6dee5239ef fix gstreamer playback 
Origin commit data
------------------
Commit: c93b2a9b0b
Author: TangoCash <eric@loxat.de>
Date: 2017-10-06 (Fri, 06 Oct 2017)
 2017-10-29 18:31:48 +01:00
TangoCash
f548a02e0c fix select osd resolution 
Origin commit data
------------------
Commit: 47d85f6e71
Author: TangoCash <eric@loxat.de>
Date: 2017-10-05 (Thu, 05 Oct 2017)
 2017-10-29 18:31:45 +01:00
TangoCash
24d20016f4 adding 4k video settings for armbox 
Origin commit data
------------------
Commit: f34589a822
Author: TangoCash <eric@loxat.de>
Date: 2017-10-05 (Thu, 05 Oct 2017)
 2017-10-29 18:31:37 +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
665f147313 add UHD icons to infoviewer 
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- add UHD icons to infoviewer

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-10-29 18:27:14 +01:00
TangoCash
9b8e581398 remove defines, fix is in stbhal ! 
Origin commit data
------------------
Commit: 96a2d5945c
Author: TangoCash <eric@loxat.de>
Date: 2017-10-28 (Sat, 28 Oct 2017)
 2017-10-28 22:37:35 +02:00
TangoCash
429aba8352 movieplayer: fix updateposition loop 
Origin commit data
------------------
Commit: af6f850ded
Author: TangoCash <eric@loxat.de>
Date: 2017-10-28 (Sat, 28 Oct 2017)
 2017-10-28 21:02:48 +02:00
TangoCash
67c6a6d8cb fixup tags 
Origin commit data
------------------
Commit: 3340b22b11
Author: TangoCash <eric@loxat.de>
Date: 2017-10-28 (Sat, 28 Oct 2017)
 2017-10-28 21:02:29 +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
8ebff3af91 allow to play audiofiles with multiformat player; split into video and audio 
Origin commit data
------------------
Commit: ab3b4993ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-28 (Sat, 28 Oct 2017)

Origin message was:
------------------
- allow to play audiofiles with multiformat player; split into video and audio
 2017-10-28 19:13:45 +02:00
vanhofen
1deb59adad Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 848ca904f6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-28 (Sat, 28 Oct 2017)
 2017-10-28 14:31:38 +02:00
vanhofen
e928f6c957 epgview: fix adzap message 
Origin commit data
------------------
Commit: b9020ee889
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-28 (Sat, 28 Oct 2017)

Origin message was:
------------------
- epgview: fix adzap message
 2017-10-28 14:30:59 +02:00
vanhofen
7137d5abd8 movieplayer: fix quickzap with RC_previoussong/nextsong 
Origin commit data
------------------
Commit: 6f6195e7ba
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-28 (Sat, 28 Oct 2017)

Origin message was:
------------------
- movieplayer: fix quickzap with RC_previoussong/nextsong
 2017-10-28 14:18:09 +02:00
vanhofen
2c7d04afc5 Revert "- movieplayer: fix eof-handling for non-coolstream platforms" 
This reverts commit bdea718755 as suggested by Satbaby


Origin commit data
------------------
Commit: 1dbbb2f2ca
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-27 (Fri, 27 Oct 2017)
 2017-10-27 23:44:50 +02:00
vanhofen
2e240b18da pictureviewer: allow RC_previoussong and RC_nextsong 
Origin commit data
------------------
Commit: 1a93e27b47
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-27 (Fri, 27 Oct 2017)

Origin message was:
------------------
- pictureviewer: allow RC_previoussong and RC_nextsong
 2017-10-27 22:05:11 +02:00
vanhofen
debe510f38 movieplayer: allow RC_previoussong and RC_nextsong 
Origin commit data
------------------
Commit: 4bea5029e1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-27 (Fri, 27 Oct 2017)

Origin message was:
------------------
- movieplayer: allow RC_previoussong and RC_nextsong
 2017-10-27 22:05:11 +02:00
vanhofen
3de826f389 audioplayer: allow RC_previoussong and RC_nextsong 
Origin commit data
------------------
Commit: f595d3bd46
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-27 (Fri, 27 Oct 2017)

Origin message was:
------------------
- audioplayer: allow RC_previoussong and RC_nextsong
 2017-10-27 22:05:11 +02:00
vanhofen
5e58fc9c7b update: ask for copy settings to new image 
Origin commit data
------------------
Commit: 1b5b18c2f7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-27 (Fri, 27 Oct 2017)

Origin message was:
------------------
- update: ask for copy settings to new image
 2017-10-27 13:17:17 +02:00
vanhofen
f017ae07e0 update_menue: hide expert functions for ARM_HARDWARE 
Origin commit data
------------------
Commit: d64fdd1044
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-26 (Thu, 26 Oct 2017)

Origin message was:
------------------
- update_menue: hide expert functions for ARM_HARDWARE
 2017-10-26 22:23:27 +02:00
vanhofen
25778e2985 update: allow ofgwrite to flash another partition 
Origin commit data
------------------
Commit: 28f522884e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-26 (Thu, 26 Oct 2017)

Origin message was:
------------------
- update: allow ofgwrite to flash another partition
 2017-10-26 21:42:51 +02:00
vanhofen
943cac66e9 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: a57a7dc44b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-25 (Wed, 25 Oct 2017)
 2017-10-25 00:31:24 +02:00
vanhofen
383857f8b8 channellist: add separator item to menu for a smoother view 
Origin commit data
------------------
Commit: 49cd7b13a3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-25 (Wed, 25 Oct 2017)

Origin message was:
------------------
- channellist: add separator item to menu for a smoother view
 2017-10-25 00:30:32 +02:00
vanhofen
439ffc068f update: fix osd flickering 
Origin commit data
------------------
Commit: 6709cffc6e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-25 (Wed, 25 Oct 2017)

Origin message was:
------------------
- update: fix osd flickering
 2017-10-25 00:05:16 +02:00
Thilo Graf
99ef3856b1 CNetworkSetup: disable network_services menu 
Required with yocto build

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


Origin commit data
------------------
Commit: 42b967fb89
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-23 (Mon, 23 Oct 2017)
 2017-10-24 11:33:00 +02:00
vanhofen
bdea718755 movieplayer: fix eof-handling for non-coolstream platforms; thx to Satbaby 
Origin commit data
------------------
Commit: 5ba724d65a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-23 (Mon, 23 Oct 2017)

Origin message was:
------------------
- movieplayer: fix eof-handling for non-coolstream platforms; thx to Satbaby
 2017-10-23 14:50:01 +02:00
vanhofen
485dd06314 update: allow online-update for AX/Mutant; add some beautiful ifdef's 
Origin commit data
------------------
Commit: 40fdc818f9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-23 (Mon, 23 Oct 2017)

Origin message was:
------------------
- update: allow online-update for AX/Mutant; add some beautiful ifdef's
 2017-10-23 14:35:28 +02:00
vanhofen
e394fc63be Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: c4810a98b9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-23 (Mon, 23 Oct 2017)
 2017-10-23 08:49:37 +02:00
vanhofen
7d5f69ba94 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 79b4837909
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-23 (Mon, 23 Oct 2017)
 2017-10-23 08:45:33 +02:00
Michael Liebmann
4ffa54040f CLuaInstCurl: Add script functions 
- encodeUri
 - decodeUri
 - setUriData
 - Set Lua api version to 1.78


Origin commit data
------------------
Commit: 9feb8efd23
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-10-23 (Mon, 23 Oct 2017)
 2017-10-23 07:54:19 +02:00
Michael Liebmann
7588f7df73 CLuaInstCurl: Fix CurlDownload() to send POST data 
- Set Lua api version to 1.77


Origin commit data
------------------
Commit: 100fa78952
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-10-23 (Mon, 23 Oct 2017)
 2017-10-23 07:54:19 +02:00
vanhofen
f9349898cb update: allow tgz-tarballs for update via ofgwrite 
Origin commit data
------------------
Commit: 9088a9431d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-21 (Sat, 21 Oct 2017)

Origin message was:
------------------
- update: allow tgz-tarballs for update via ofgwrite
 2017-10-21 16:29:48 +02:00
Stefan Seyfried
ac4dd11b16 Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: 6512c74754
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-19 (Thu, 19 Oct 2017)
 2017-10-19 19:17:06 +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
f5bea1c0cd Revert "CComponentsPIP: use default background image as default image" 
This reverts commit 68ea18ecbf.


Origin commit data
------------------
Commit: 3e754c36d0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-18 (Wed, 18 Oct 2017)
 2017-10-18 09:43:09 +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
04249e850b CUpnpBrowserGui: fix button arrangement 
defined label width parameter was too large


Origin commit data
------------------
Commit: acf9cdfea8
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-16 (Mon, 16 Oct 2017)
 2017-10-17 20:03:10 +02:00
Thilo Graf
68ea18ecbf CComponentsPIP: use default background image as default image 
Origin commit data
------------------
Commit: e169a76ff9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-16 (Mon, 16 Oct 2017)
 2017-10-17 20:02:23 +02:00
Jacek Jendrzej
d49c063273 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 306c52642d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-17 (Tue, 17 Oct 2017)
 2017-10-17 12:45:19 +02:00
Jacek Jendrzej
be413a20a0 movieplayer.cpp remove free , attempting free on address which was not malloc()-ed 
Origin commit data
------------------
Commit: 79a9186515
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-17 (Tue, 17 Oct 2017)

Origin message was:
------------------
movieplayer.cpp remove free , attempting free on address which was not malloc()-ed
 2017-10-17 12:42:32 +02:00
Jacek Jendrzej
041101db81 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 4b8cf23d70
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-16 (Mon, 16 Oct 2017)
 2017-10-16 13:17:17 +02:00
TangoCash
9f4e6ff79f let playback handle devices 
Origin commit data
------------------
Commit: 9f0397c363
Author: TangoCash <eric@loxat.de>
Date: 2017-10-15 (Sun, 15 Oct 2017)
 2017-10-15 17:36:35 +02:00
vanhofen
5a8232a688 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/streaminfo2.cpp


Origin commit data
------------------
Commit: f166f36e9a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)
 2017-10-14 16:10:22 +02:00