Commit Graph

1401 Commits

Author SHA1 Message Date
Thilo Graf
0a720b271f locales: fix order
thx balkon


Origin commit data
------------------
Branch: ni/coolstream
Commit: 82109b2daf
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-02-14 (Wed, 14 Feb 2018)



------------------
This commit was generated by Migit
2018-02-14 21:58:22 +01:00
Thilo Graf
ebc0ef2fb8 locales: more precise setting for startup volume in audio settings
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5eb5d71405
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-02-14 (Wed, 14 Feb 2018)


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

------------------
This commit was generated by Migit
2018-02-14 21:58:22 +01:00
vanhofen
02db8d5f8a setting_helpers: replace another ostringstream by simple string
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0919ebe2df
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-02-10 (Sat, 10 Feb 2018)

Origin message was:
------------------
- setting_helpers: replace another ostringstream by simple string

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

------------------
This commit was generated by Migit
2018-02-10 21:20:33 +01:00
Thilo Graf
a0dc7bae9a data types: use unified type name uint8_t instead u_int8_t
Origin commit data
------------------
Branch: ni/coolstream
Commit: 92adabc04b
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-01-19 (Fri, 19 Jan 2018)


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

------------------
This commit was generated by Migit
2018-01-21 20:19:18 +01:00
vanhofen
b4809f0a30 user_menu: add item to start timeshift immediately
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7581db246e
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-15 (Mon, 15 Jan 2018)

Origin message was:
------------------
- user_menu: add item to start timeshift immediately

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

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


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

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

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


------------------
This commit was generated by Migit
2018-01-15 19:54:51 +01:00
vanhofen
fb3e0391a4 remove obsolete code
Origin commit data
------------------
Branch: ni/coolstream
Commit: bf412e4c20
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-07 (Sun, 07 Jan 2018)

Origin message was:
------------------
- remove obsolete code

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

------------------
This commit was generated by Migit
2018-01-07 18:06:34 +01:00
vanhofen
f42b1b9095 flashtool: add posibilty to get localized and non-localized type
Origin commit data
------------------
Branch: ni/coolstream
Commit: 40b84d1077
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-06 (Sat, 06 Jan 2018)

Origin message was:
------------------
- flashtool: add posibilty to get localized and non-localized type

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

------------------
This commit was generated by Migit
2018-01-06 14:46:09 +01:00
vanhofen
dff25a1144 Revert "Revert "- flashtool: localize getType() function""
This reverts commit 836995f419.


Origin commit data
------------------
Branch: ni/coolstream
Commit: b546f6d2f0
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-06 (Sat, 06 Jan 2018)



------------------
This commit was generated by Migit
2018-01-06 14:46:09 +01:00
vanhofen
8dbcc00776 flashtool: use unused type internal for upcoming nightly builds
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4817ebb679
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-06 (Sat, 06 Jan 2018)

Origin message was:
------------------
- flashtool: use unused type internal for upcoming nightly builds

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

------------------
This commit was generated by Migit
2018-01-06 00:06:40 +01:00
vanhofen
c55dc9bf93 flashtool: remove wrong todo-comment
Origin commit data
------------------
Branch: ni/coolstream
Commit: df94839908
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-06 (Sat, 06 Jan 2018)

Origin message was:
------------------
- flashtool: remove wrong todo-comment

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

------------------
This commit was generated by Migit
2018-01-06 00:06:40 +01:00
vanhofen
836995f419 Revert "- flashtool: localize getType() function"
This reverts commit 780fa8a74d.
It wasn't a good idea to localize these output. Parsing is much
easier with hardcoded strings.


Origin commit data
------------------
Branch: ni/coolstream
Commit: a1575562b9
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-06 (Sat, 06 Jan 2018)



------------------
This commit was generated by Migit
2018-01-06 00:06:40 +01:00
vanhofen
68288c0213 Revert "- audio_select: copy full code from TangoCash"
This reverts commit a98e5fd8f7.

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/audio_select.cpp
	src/system/setting_helpers.cpp
	src/system/setting_helpers.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2cd2a8599c
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)



------------------
This commit was generated by Migit
2018-01-03 11:55:54 +01:00
vanhofen
32e2a33ce2 locale: split fileplay hints into audio and video
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8115cf24ab
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-19 (Tue, 19 Dec 2017)

Origin message was:
------------------
- locale: split fileplay hints into audio and video

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

------------------
This commit was generated by Migit
2017-12-19 12:46:04 +01:00
vanhofen
43dead3464 user-menu: add audio fileplay item
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9fb2036ee7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-19 (Tue, 19 Dec 2017)

Origin message was:
------------------
- user-menu: add audio fileplay item

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

------------------
This commit was generated by Migit
2017-12-19 12:46:04 +01:00
vanhofen
9b5758d55a settings_manager: remember last used directory
Origin commit data
------------------
Branch: ni/coolstream
Commit: 864907a95f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-15 (Fri, 15 Dec 2017)

Origin message was:
------------------
- settings_manager: remember last used directory

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

------------------
This commit was generated by Migit
2017-12-15 23:20:55 +01:00
vanhofen
4bd6a1dcb3 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c35e647878
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-07 (Thu, 07 Dec 2017)



------------------
This commit was generated by Migit
2017-12-07 12:17:23 +01:00
TangoCash
f1cde66135 add DVB-S2X support
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4e65f22bdf
Author: TangoCash <eric@loxat.de>
Date: 2017-12-04 (Mon, 04 Dec 2017)


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

------------------
This commit was generated by Migit
2017-12-06 10:47:36 +01:00
Thilo Graf
ff16cbbeb4 localize: try to fix different path to iso tab
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c859db7c4
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-12-06 (Wed, 06 Dec 2017)


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

------------------
This commit was generated by Migit
2017-12-06 10:46:27 +01:00
TangoCash
696b3316db add DVB-S2X support
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5f24f44353
Author: TangoCash <eric@loxat.de>
Date: 2017-12-04 (Mon, 04 Dec 2017)


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

------------------
This commit was generated by Migit
2017-12-04 09:46:04 +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
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
vanhofen
fd04c563e9 vfd-setup: allow to set scroll_repeats if possible
Signed-off-by: Thilo Graf <dbt@novatux.de>


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


------------------
This commit was generated by Migit
2017-11-16 20:39:34 +01:00
vanhofen
d4d58c0bb5 proc_tools: add helper member to put values w/o length; ...
align included headers to c++

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


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

Origin message was:
------------------
- proc_tools: add helper member to put values w/o length; ...

align included headers to c++

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


------------------
This commit was generated by Migit
2017-11-16 20:39:34 +01:00
vanhofen
bbcb437c20 proc_tools: c => cpp; add new helper member to write bool values
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- proc_tools: c => cpp; add new helper member to write bool values

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


------------------
This commit was generated by Migit
2017-11-16 20:39:34 +01:00
vanhofen
e1ba66c7a5 system: add seife's proc_tools
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- system: add seife's proc_tools

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


------------------
This commit was generated by Migit
2017-11-16 20:39:34 +01:00
vanhofen
31520a997e cleanup from unsupported DUCKBOX_HARDWARE
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- cleanup from unsupported DUCKBOX_HARDWARE

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


------------------
This commit was generated by Migit
2017-11-16 19:43:26 +01:00
vanhofen
378501af51 streaminfo: port from TangoCash
Conflicts:
	src/gui/streaminfo2.cpp

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


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

Origin message was:
------------------
- streaminfo: port from TangoCash

 Conflicts:
	src/gui/streaminfo2.cpp

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


------------------
This commit was generated by Migit
2017-11-16 19:43:26 +01:00
vanhofen
f65f53b605 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
------------------
Branch: ni/coolstream
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>


------------------
This commit was generated by Migit
2017-11-16 19:43:26 +01:00
vanhofen
4620d01da3 neutrino: add "need_reboot" feature
Origin commit data
------------------
Branch: ni/coolstream
Commit: f6253de913
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-14 (Tue, 14 Nov 2017)

Origin message was:
------------------
- neutrino: add "need_reboot" feature

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

------------------
This commit was generated by Migit
2017-11-14 22:43:39 +01:00
vanhofen
82064eb49c vfd-setup: allow to set scroll_repeats if possible
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2017-11-13 22:47:11 +01:00
vanhofen
0d05d5eddf proc_tools: add helper member to put values w/o length; ...
align included headers to c++


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

Origin message was:
------------------
- proc_tools: add helper member to put values w/o length; ...

align included headers to c++


------------------
This commit was generated by Migit
2017-11-13 21:17:36 +01:00
vanhofen
e76cb5303d proc_tools: c => cpp; add new helper member to write bool values
Origin commit data
------------------
Branch: ni/coolstream
Commit: 40044905db
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-13 (Mon, 13 Nov 2017)

Origin message was:
------------------
- proc_tools: c => cpp; add new helper member to write bool values

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

------------------
This commit was generated by Migit
2017-11-13 21:17:36 +01:00
vanhofen
b5425ed82d system: add seife's proc_tools
Origin commit data
------------------
Branch: ni/coolstream
Commit: bb9313ebb3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-13 (Mon, 13 Nov 2017)

Origin message was:
------------------
- system: add seife's proc_tools

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

------------------
This commit was generated by Migit
2017-11-13 21:17:36 +01:00
vanhofen
43f3c8bae2 some minor renamings
Origin commit data
------------------
Branch: ni/coolstream
Commit: f3ded5d509
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-09 (Thu, 09 Nov 2017)

Origin message was:
------------------
- some minor renamings

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

------------------
This commit was generated by Migit
2017-11-09 20:56:57 +01:00
vanhofen
b9fd1ef634 cleanup from unsupported DUCKBOX_HARDWARE
Origin commit data
------------------
Branch: ni/coolstream
Commit: bc0de58721
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-08 (Wed, 08 Nov 2017)

Origin message was:
------------------
- cleanup from unsupported DUCKBOX_HARDWARE

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

------------------
This commit was generated by Migit
2017-11-08 09:28:34 +01:00
vanhofen
9267192aa6 streaminfo: port from TangoCash
Origin commit data
------------------
Branch: ni/coolstream
Commit: d3b4fae12a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)

Origin message was:
------------------
- streaminfo: port from TangoCash

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

------------------
This commit was generated by Migit
2017-11-06 23:08:42 +01:00
vanhofen
66784d42af add webradio; first steps
Origin commit data
------------------
Branch: ni/coolstream
Commit: a8b0fee599
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

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

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

------------------
This commit was generated by Migit
2017-11-03 09:36:19 +01:00
vanhofen
261bb4bc7b update: ask for copy settings to new image
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4a5adfcb23
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-27 (Fri, 27 Oct 2017)

Origin message was:
------------------
- update: ask for copy settings to new image

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


------------------
This commit was generated by Migit
2017-10-29 21:47:16 +01:00
vanhofen
a65c9b02cf update: allow ofgwrite to flash another partition
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 80a9198603
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-26 (Thu, 26 Oct 2017)

Origin message was:
------------------
- update: allow ofgwrite to flash another partition

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


------------------
This commit was generated by Migit
2017-10-29 21:37:41 +01:00
TangoCash
77a4db2431 modify autocreate HD _and_ UHD channels as seperate lists
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9c12ce65aa
Author: TangoCash <eric@loxat.de>
Date: 2017-10-20 (Fri, 20 Oct 2017)



------------------
This commit was generated by Migit
2017-10-29 18:33:58 +01:00
vanhofen
24e3d9bb05 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
------------------
Branch: ni/coolstream
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>


------------------
This commit was generated by Migit
2017-10-29 18:32:30 +01:00
TangoCash
84da2f4127 adding 4k video settings for armbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: f34589a822
Author: TangoCash <eric@loxat.de>
Date: 2017-10-05 (Thu, 05 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-29 18:31:37 +01:00
vanhofen
9a4871dea1 multiformat audioplayer: add separate timeout for infobar
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2017-10-28 19:13:46 +02:00
vanhofen
1e886e96a8 allow to play audiofiles with multiformat player; split into video and audio
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2017-10-28 19:13:45 +02:00
vanhofen
9df74db5dd update: ask for copy settings to new image
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2017-10-27 13:17:17 +02:00
vanhofen
11f851d050 update: allow ofgwrite to flash another partition
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2017-10-26 21:42:51 +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
Jacek Jendrzej
dbf6f5127d Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4b8cf23d70
Author: Jacek Jendrzej <overx300@gmail.com>
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-16 13:17:17 +02:00
vanhofen
bb2b748ea3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/components/cc_frm_footer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 33857873dc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)



------------------
This commit was generated by Migit
2017-10-14 07:15:30 +02:00