Commit Graph

1442 Commits

Author SHA1 Message Date
vanhofen
0287193bd3 fix RC_tv/RC_radio handling; ...
if we have separate keys for that we don't need to switch mode


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


------------------
This commit was generated by Migit
2017-10-28 14:18:09 +02:00
vanhofen
ba4699148c rcinput: add KEY_PROGRAM
Origin commit data
------------------
Branch: ni/coolstream
Commit: 282db3025a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-27 (Fri, 27 Oct 2017)

Origin message was:
------------------
- rcinput: add KEY_PROGRAM

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

------------------
This commit was generated by Migit
2017-10-27 23:43:44 +02:00
gixxpunk
d5cf0fbcb6 fix merge
Origin commit data
------------------
Branch: ni/coolstream
Commit: 311714f54b
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-10-21 (Sat, 21 Oct 2017)

Origin message was:
------------------
- fix merge

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

------------------
This commit was generated by Migit
2017-10-21 15:04:00 +02:00
gixxpunk
1d10defb4c Merge branch 'ni/tuxbox' of bitbucket.org:neutrino-images/ni-neutrino-hd into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e18eb56492
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-10-21 (Sat, 21 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-21 14:54:59 +02:00
gixxpunk
fbaad22a4d fix crash on init
Origin commit data
------------------
Branch: ni/coolstream
Commit: 549422d431
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-10-21 (Sat, 21 Oct 2017)

Origin message was:
------------------
- fix crash on init

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

------------------
This commit was generated by Migit
2017-10-21 10:51:15 +02:00
TangoCash
0aed9206ff modify autocreate HD _and_ UHD channels as seperate lists
Origin commit data
------------------
Branch: ni/coolstream
Commit: ec7f5e9b98
Author: TangoCash <eric@loxat.de>
Date: 2017-10-20 (Fri, 20 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-20 08:02:09 +02:00
vanhofen
f504430ba9 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
------------------
Branch: ni/coolstream
Commit: 20d546e42f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-18 (Wed, 18 Oct 2017)



------------------
This commit was generated by Migit
2017-10-18 09:53:55 +02:00
vanhofen
e143e0bcb0 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
------------------
Branch: ni/coolstream
Commit: 4121099dcf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-18 (Wed, 18 Oct 2017)



------------------
This commit was generated by Migit
2017-10-18 09:41:46 +02:00
Thilo Graf
5f29c788a7 Merge branch 'pu/mp' into 'master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: ccb19a8880
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-17 (Tue, 17 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-17 20:38:58 +02:00
Thilo Graf
71d16e9142 neutrino.cpp: show logo on start up
Origin commit data
------------------
Branch: ni/coolstream
Commit: 54750e49b7
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-16 (Mon, 16 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-17 20:02:45 +02:00
vanhofen
a98e5fd8f7 audio_select: copy full code from TangoCash
Just compile tested. Maybe some more alignments needed.


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


------------------
This commit was generated by Migit
2017-10-12 08:52:32 +02:00
vanhofen
f6314ca7c3 neutrino: don't scroll standby/resume text on frontdisplay
Origin commit data
------------------
Branch: ni/coolstream
Commit: 27a16a6f9f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)

Origin message was:
------------------
- neutrino: don't scroll standby/resume text on frontdisplay

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

------------------
This commit was generated by Migit
2017-10-12 00:43:56 +02:00
vanhofen
a84d642cff add hd51; mostly ported from TangoCash's neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 09ae4c3a51
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

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

------------------
This commit was generated by Migit
2017-10-05 12:52:53 +02:00
Jacek Jendrzej
a25626adc1 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: b7ceb705a0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-26 (Tue, 26 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-26 12:52:04 +02:00
Stefan Seyfried
19c0e04c37 add comments to suppres -Wimplicit-fallthrough warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: 971f3703a6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-26 12:41:05 +02:00
Stefan Seyfried
6979a29c94 change time_monotonic_ms() from time_t to int64_t
time_monotonic_ms values did wrap every ~24 days, leading to problems
in code that did not cope with that. Instead of fixing all places where
relative comparisons with time_monotonic_ms() are made, just use a
bigger datatype. Convert all users to the new type.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8dad062eff
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)



------------------
This commit was generated by Migit
2017-09-26 11:37:19 +02:00
vanhofen
b6954dec34 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	configure.ac
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 11d7263bcd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)



------------------
This commit was generated by Migit
2017-09-25 11:41:44 +02:00
vanhofen
cd18fa9ca0 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/driver/rcinput.cpp
	src/gui/audioplayer.cpp
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a58f2cc447
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)



------------------
This commit was generated by Migit
2017-09-25 11:36:34 +02:00
Stefan Seyfried
a4040cbcb9 add comments to suppres -Wimplicit-fallthrough warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0ea72b9d51
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-25 11:25:50 +02:00
Stefan Seyfried
267ba4b9f4 change time_monotonic_ms() from time_t to int64_t
time_monotonic_ms values did wrap every ~24 days, leading to problems
in code that did not cope with that. Instead of fixing all places where
relative comparisons with time_monotonic_ms() are made, just use a
bigger datatype. Convert all users to the new type.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 99ff4857ff
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)



------------------
This commit was generated by Migit
2017-09-23 21:35:01 +02:00
Stefan Seyfried
9fd8627bc8 add comments to suppres -Wimplicit-fallthrough warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: a497a2b86c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-23 18:11:47 +02:00
Stefan Seyfried
97ba018af4 Merge remote-tracking branch 'tuxbox/master'
needs buildfixes


Origin commit data
------------------
Branch: ni/coolstream
Commit: 514cb3ed1e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)



------------------
This commit was generated by Migit
2017-09-23 17:01:42 +02:00
vanhofen
83be9c1fe3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6dd6df52fb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-18 21:53:44 +02:00
gixxpunk
570ba4305b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 315a87f2be
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-18 16:31:55 +02:00
Jacek Jendrzej
c615da9fd2 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2dd24f8c21
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-18 15:55:41 +02:00
Jacek Jendrzej
c79807fc3a fix memleak
Origin commit data
------------------
Branch: ni/coolstream
Commit: 511d953a18
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-18 14:11:34 +02:00
Jacek Jendrzej
8333edc0fb Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 98a31ea821
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-13 15:53:42 +02:00
vanhofen
fec79fd522 rework multimedia-menu code; cleanup from many unused code
Origin commit data
------------------
Branch: ni/coolstream
Commit: d23323758c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- rework multimedia-menu code; cleanup from many unused code

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

------------------
This commit was generated by Migit
2017-09-13 15:52:19 +02:00
vanhofen
5de0c243cc Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a0f93d9281
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-13 15:07:03 +02:00
vanhofen
46e5e5e202 rework multimedia-menu code; cleanup from many unused code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 56cdb2dd6c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- rework multimedia-menu code; cleanup from many unused code

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

------------------
This commit was generated by Migit
2017-09-13 14:46:38 +02:00
Jacek Jendrzej
113f930317 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: a5bc9f1050
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-13 14:09:21 +02:00
Jacek Jendrzej
f55d2b44a6 fix pick diff error
Origin commit data
------------------
Branch: ni/coolstream
Commit: a7813a885d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-13 14:08:29 +02:00
Jacek Jendrzej
35227f219c Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4e232439c3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-13 13:52:49 +02:00
vanhofen
30105a0b3f remove unused nkplay stuff
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1fae4130b8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- remove unused nkplay stuff

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

------------------
This commit was generated by Migit
2017-09-13 13:48:16 +02:00
Jacek Jendrzej
bea20473aa Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c5bf73006
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-13 13:40:40 +02:00
vanhofen
9b9e405f04 drop easymenu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 816de89898
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- drop easymenu

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

------------------
This commit was generated by Migit
2017-09-13 13:35:23 +02:00
vanhofen
fadeac1d43 remove unused nkplay stuff
Origin commit data
------------------
Branch: ni/coolstream
Commit: 93c8768fbf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- remove unused nkplay stuff

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

------------------
This commit was generated by Migit
2017-09-13 13:09:34 +02:00
vanhofen
b6b296939a Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: bf366676b8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)



------------------
This commit was generated by Migit
2017-09-13 12:52:23 +02:00
vanhofen
2a4d7155b5 remove easymenu from config-file
Origin commit data
------------------
Branch: ni/coolstream
Commit: f42b74a317
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- remove easymenu from config-file

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

------------------
This commit was generated by Migit
2017-09-13 10:45:23 +02:00
vanhofen
2097d7e876 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 163a6004fa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)



------------------
This commit was generated by Migit
2017-09-13 08:36:25 +02:00
vanhofen
274dbc2d1e drop easymenu
Origin commit data
------------------
Branch: ni/coolstream
Commit: b502ed31b9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- drop easymenu

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

------------------
This commit was generated by Migit
2017-09-12 23:46:22 +02:00
vanhofen
e6d2ba00b3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9e6dc9fbce
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)



------------------
This commit was generated by Migit
2017-09-12 22:32:07 +02:00
vanhofen
390b4406d0 move some actionkey-stuff from ni-menu directly to neutrino.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 16b57e40a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- move some actionkey-stuff from ni-menu directly to neutrino.cpp

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

------------------
This commit was generated by Migit
2017-09-12 22:30:35 +02:00
vanhofen
88d02d6b60 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4bc4a80094
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-09 08:44:18 +02:00
vanhofen
ab5d217f63 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: eb76978295
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-09 08:43:52 +02:00
Jacek Jendrzej
a67cecd575 remove double includes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6576729fd1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-08 (Fri, 08 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-08 21:21:32 +02:00
vanhofen
c5d81a62c4 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6488fbf13a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)



------------------
This commit was generated by Migit
2017-09-07 16:41:06 +02:00
vanhofen
660c17ad44 add possibility to signalize available online-updates in infoicons
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3294d9f74d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-04 (Mon, 04 Sep 2017)

Origin message was:
------------------
- add possibility to signalize available online-updates in infoicons

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

------------------
This commit was generated by Migit
2017-09-04 17:17:27 +02:00
vanhofen
4b44169b39 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ff282cbad1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-27 (Sun, 27 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-27 23:56:52 +02:00
vanhofen
31716245ba Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	configure.ac
	src/driver/screenshot.cpp
	src/driver/streamts.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a4fd09ecc2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-27 (Sun, 27 Aug 2017)



------------------
This commit was generated by Migit
2017-08-27 23:55:53 +02:00