Commit Graph

1188 Commits

Author SHA1 Message Date
vanhofen
b416fcda65 themes: add new shadow-color to our material themes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 88d34a3e0d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-12 (Sat, 12 Aug 2017)

Origin message was:
------------------
- themes: add new shadow-color to our material themes

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

------------------
This commit was generated by Migit
2017-08-12 13:51:00 +02:00
vanhofen
6828142ef9 english.locale: fix typo
Origin commit data
------------------
Branch: ni/coolstream
Commit: 342d46d5c8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-08 (Tue, 08 Aug 2017)

Origin message was:
------------------
- english.locale: fix typo

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

------------------
This commit was generated by Migit
2017-08-08 16:41:57 +02:00
vanhofen
0969f10931 Partly revert "english.locale: corrections in channellist locales"
This partly reverts commit c647e359ec.

Conflicts:
	data/locale/english.locale


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



------------------
This commit was generated by Migit
2017-08-08 16:41:08 +02:00
vanhofen
aa022d1ee4 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fb_generic.cpp
	src/gui/components/cc_frm_header.h
	src/gui/osd_setup.cpp
	src/gui/themes.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/settings.h


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



------------------
This commit was generated by Migit
2017-08-08 15:54:12 +02:00
Thilo Graf
c647e359ec english.locale: corrections in channellist locales
Consideration of rules for capitalization of headings, titles and labels.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 57e410c052
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-07 (Mon, 07 Aug 2017)



------------------
This commit was generated by Migit
2017-08-08 14:25:12 +02:00
Thilo Graf
208498a730 Colorsettings: add possibility to change shadow color
Shadow color was bound to infobar color and it's not really
understandable why, because with some colors eg. black, the shadow is
grey or with other colors it is exaggerated colored and seems to be
not realistically and looks unusual if shadow is brighter or colorful
than foreground. Some themes will thank it.

TODO: update theme files with matching values if required


Origin commit data
------------------
Branch: ni/coolstream
Commit: c600b4c416
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-02 (Wed, 02 Aug 2017)



------------------
This commit was generated by Migit
2017-08-08 14:25:12 +02:00
vanhofen
ec7ea3a2c8 english.locale: small corrections in channellist locales
Origin commit data
------------------
Branch: ni/coolstream
Commit: 752ddf25df
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-06 (Sun, 06 Aug 2017)

Origin message was:
------------------
- english.locale: small corrections in channellist locales

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

------------------
This commit was generated by Migit
2017-08-06 21:00:45 +02:00
vanhofen
0c585b0d70 audioplayer: allow to load radio-favorites.xml via menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6a3fa8c4e7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)

Origin message was:
------------------
- audioplayer: allow to load radio-favorites.xml via menu

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

------------------
This commit was generated by Migit
2017-06-28 16:26:36 +02:00
vanhofen
2cfee7cc7d radio-favorites.xml: add new sample entry
Origin commit data
------------------
Branch: ni/coolstream
Commit: 113e0e4f34
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-27 (Tue, 27 Jun 2017)

Origin message was:
------------------
- radio-favorites.xml: add new sample entry

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

------------------
This commit was generated by Migit
2017-06-27 23:45:57 +02:00
vanhofen
1f79ba0b8a moviebrowser: clearify deletion-locale; add movie-title to menu
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 37f9306862
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-21 (Wed, 21 Jun 2017)

Origin message was:
------------------
- moviebrowser: clearify deletion-locale; add movie-title to menu

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


------------------
This commit was generated by Migit
2017-06-21 10:31:22 +02:00
vanhofen
e637fe38f9 moviebrowser: clearify deletion-locale; add movie-title to menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: b6b4286c99
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-20 (Tue, 20 Jun 2017)

Origin message was:
------------------
- moviebrowser: clearify deletion-locale; add movie-title to menu

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

------------------
This commit was generated by Migit
2017-06-20 22:56:23 +02:00
vanhofen
a3d5baa1e6 audioplayer: small design reworks ...
* use OFFSET defines
* use CComponentsScrollbar
* rename some variables
* many, many position calculation fixes
* re-format code

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4c21971b4a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)

Origin message was:
------------------
- audioplayer: small design reworks ...

* use OFFSET defines
* use CComponentsScrollbar
* rename some variables
* many, many position calculation fixes
* re-format code

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


------------------
This commit was generated by Migit
2017-06-18 00:04:40 +02:00
vanhofen
aa1470d37e audioplayer: small design reworks ...
* use OFFSET defines
* use CComponentsScrollbar
* rename some variables
* many, many position calculation fixes
* re-format code


Origin commit data
------------------
Branch: ni/coolstream
Commit: 96cd0f09a1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-17 (Sat, 17 Jun 2017)

Origin message was:
------------------
- audioplayer: small design reworks ...

* use OFFSET defines
* use CComponentsScrollbar
* rename some variables
* many, many position calculation fixes
* re-format code


------------------
This commit was generated by Migit
2017-06-17 15:00:54 +02:00
vanhofen
c7e763aa61 locale: minor changes in audioplayer's and pictureviewer's locales
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: ddb027a006
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- locale: minor changes in audioplayer's and pictureviewer's locales

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


------------------
This commit was generated by Migit
2017-06-15 01:01:55 +02:00
Thilo Graf
90af43f37f icon: add missing pictureviewer icon
Origin commit data
------------------
Branch: ni/coolstream
Commit: d78e132ba2
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-15 01:01:55 +02:00
vanhofen
9d69ed31b0 vfd-setup: fix brightness setup for CST's boxmodel "Link" ...
and hide the brightness menu for all "Trinity" models. There's no display.

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4295839526
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- vfd-setup: fix brightness setup for CST's boxmodel "Link" ...

and hide the brightness menu for all "Trinity" models. There's no display.

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


------------------
This commit was generated by Migit
2017-06-15 01:01:55 +02:00
vanhofen
c20952dba2 locale: minor changes in audioplayer's and pictureviewer's locales
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2a63c3f58b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-14 (Wed, 14 Jun 2017)

Origin message was:
------------------
- locale: minor changes in audioplayer's and pictureviewer's locales

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

------------------
This commit was generated by Migit
2017-06-14 14:57:09 +02:00
vanhofen
e4f4307eb6 vfd-setup: fix brightness setup for CST's boxmodel "Link" ...
and hide the brightness menu for all "Trinity" models. There's no display.


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

Origin message was:
------------------
- vfd-setup: fix brightness setup for CST's boxmodel "Link" ...

and hide the brightness menu for all "Trinity" models. There's no display.


------------------
This commit was generated by Migit
2017-06-12 13:14:32 +02:00
vanhofen
1fc432032a icons: fix size of youtube header icon
Origin commit data
------------------
Branch: ni/coolstream
Commit: 02da66755f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-09 (Fri, 09 Jun 2017)

Origin message was:
------------------
- icons: fix size of youtube header icon

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

------------------
This commit was generated by Migit
2017-06-09 14:07:05 +02:00
Michael Liebmann
e2b33894eb Merge branch 'pu/fb-setmode'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 624f2b3154
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-07 14:18:01 +02:00
vanhofen
0700c6cadd icons: move mp3.png from /headers to /filetypes; align icon size
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: a43617dda3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)

Origin message was:
------------------
- icons: move mp3.png from /headers to /filetypes; align icon size

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


------------------
This commit was generated by Migit
2017-06-07 14:17:12 +02:00
vanhofen
0b4acaab6c icons: add filetype-icon for pictures
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: d8f364ca46
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)

Origin message was:
------------------
- icons: add filetype-icon for pictures

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


------------------
This commit was generated by Migit
2017-06-07 14:17:11 +02:00
vanhofen
f235e9b1ec locale: small changes in filebrowser's sort locales
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 49bd2e9ba7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)

Origin message was:
------------------
- locale: small changes in filebrowser's sort locales

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


------------------
This commit was generated by Migit
2017-06-07 14:17:11 +02:00
vanhofen
83cdc44dca fonts: add ubuntumono-r-webfont.ttf
Origin commit data
------------------
Branch: ni/coolstream
Commit: 65f1b6d43e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)

Origin message was:
------------------
- fonts: add ubuntumono-r-webfont.ttf

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

------------------
This commit was generated by Migit
2017-06-07 14:07:08 +02:00
vanhofen
cb06d88fe4 icons: change filetypes/folder.png for a better visibility
Origin commit data
------------------
Branch: ni/coolstream
Commit: a94011b4e4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-06 (Tue, 06 Jun 2017)

Origin message was:
------------------
- icons: change filetypes/folder.png for a better visibility

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

------------------
This commit was generated by Migit
2017-06-06 17:07:07 +02:00
vanhofen
27fb8a8db8 remove graphic progressbar
Origin commit data
------------------
Branch: ni/coolstream
Commit: 675c0dc6f6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-06 (Tue, 06 Jun 2017)

Origin message was:
------------------
- remove graphic progressbar

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

------------------
This commit was generated by Migit
2017-06-06 00:09:31 +02:00
vanhofen
1f1e9a0fb3 icons: move mp3.png from /headers to /filetypes; align icon size
Origin commit data
------------------
Branch: ni/coolstream
Commit: f9bcf9c785
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)

Origin message was:
------------------
- icons: move mp3.png from /headers to /filetypes; align icon size

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

------------------
This commit was generated by Migit
2017-05-30 01:24:21 +02:00
vanhofen
0ea8f1633b icons: add filetype-icon for pictures
Origin commit data
------------------
Branch: ni/coolstream
Commit: 47124cd7f5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)

Origin message was:
------------------
- icons: add filetype-icon for pictures

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

------------------
This commit was generated by Migit
2017-05-30 01:24:21 +02:00
vanhofen
0b9f8c5440 locale: small changes in filebrowser's sort locales
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9911f8992e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)

Origin message was:
------------------
- locale: small changes in filebrowser's sort locales

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

------------------
This commit was generated by Migit
2017-05-30 01:24:21 +02:00
vanhofen
ce88037a70 imdb: add runtime locale; split release-date and runtime
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2bdf1b6ecc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-29 (Mon, 29 May 2017)

Origin message was:
------------------
- imdb: add runtime locale; split release-date and runtime

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

------------------
This commit was generated by Migit
2017-05-29 12:57:28 +02:00
vanhofen
3188f46c69 imdb: add plot locale
Origin commit data
------------------
Branch: ni/coolstream
Commit: faac9f656a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-29 (Mon, 29 May 2017)

Origin message was:
------------------
- imdb: add plot locale

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

------------------
This commit was generated by Migit
2017-05-29 12:57:28 +02:00
vanhofen
9926360aee imdb: localize output
Origin commit data
------------------
Branch: ni/coolstream
Commit: 47d920a3e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-29 (Mon, 29 May 2017)

Origin message was:
------------------
- imdb: localize output

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

------------------
This commit was generated by Migit
2017-05-29 11:49:00 +02:00
vanhofen
7836f9742f locale: minor changes in font size locales
Origin commit data
------------------
Branch: ni/coolstream
Commit: b3cb5652ba
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)

Origin message was:
------------------
- locale: minor changes in font size locales

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

------------------
This commit was generated by Migit
2017-05-23 19:25:04 +02:00
vanhofen
1e81b5f931 locale: clearify locales for external channellogo directory
Origin commit data
------------------
Branch: ni/coolstream
Commit: b4484f759a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)

Origin message was:
------------------
- locale: clearify locales for external channellogo directory

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

------------------
This commit was generated by Migit
2017-05-23 17:58:53 +02:00
vanhofen
a93d950357 osd_setup: move channellist_show_channellogo to new logo menu; ...
align locales


Origin commit data
------------------
Branch: ni/coolstream
Commit: fe50c85a3b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)

Origin message was:
------------------
- osd_setup: move channellist_show_channellogo to new logo menu; ...

align locales


------------------
This commit was generated by Migit
2017-05-23 17:58:53 +02:00
vanhofen
49d1c9d622 osd_setup: add channellogo-setup menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: e9297bcc1c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)

Origin message was:
------------------
- osd_setup: add channellogo-setup menu

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

------------------
This commit was generated by Migit
2017-05-23 17:58:53 +02:00
Thilo Graf
0d0a59855d Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: c0cc7ef192
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-21 (Sun, 21 May 2017)


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

------------------
This commit was generated by Migit
2017-05-21 18:09:22 +02:00
vanhofen
dd6ad99925 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5c077b22e4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-19 (Fri, 19 May 2017)


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

------------------
This commit was generated by Migit
2017-05-19 21:18:09 +02:00
vanhofen
0298255e71 cables.xml: update Antennengemeinschaft "Goeltzschtalbruecke"
Origin commit data
------------------
Branch: ni/coolstream
Commit: b7ef6e47fe
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-17 (Wed, 17 May 2017)

Origin message was:
------------------
- cables.xml: update Antennengemeinschaft "Goeltzschtalbruecke"

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

------------------
This commit was generated by Migit
2017-05-17 17:23:22 +02:00
vanhofen
48333f7646 locale: more minor changes
Origin commit data
------------------
Branch: ni/coolstream
Commit: af1e89e656
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)

Origin message was:
------------------
- locale: more minor changes

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

------------------
This commit was generated by Migit
2017-05-16 16:43:10 +02:00
vanhofen
bfb6ce5ca1 locale: clearify hints for bisection jumps
Origin commit data
------------------
Branch: ni/coolstream
Commit: 22d36d3e83
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)

Origin message was:
------------------
- locale: clearify hints for bisection jumps

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

------------------
This commit was generated by Migit
2017-05-16 15:59:04 +02:00
vanhofen
8bf073a7cd deutsch.locale: minor change
Origin commit data
------------------
Branch: ni/coolstream
Commit: e99b0188ab
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)

Origin message was:
------------------
- deutsch.locale: minor change

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

------------------
This commit was generated by Migit
2017-05-16 15:26:20 +02:00
vanhofen
5705809f1a movieplayer: allow bisectional jumps with RC_page_up/down
based upon code by TangoCash


Origin commit data
------------------
Branch: ni/coolstream
Commit: ca218e5390
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-13 (Sat, 13 May 2017)

Origin message was:
------------------
- movieplayer: allow bisectional jumps with RC_page_up/down

based upon code by TangoCash


------------------
This commit was generated by Migit
2017-05-13 17:45:59 +02:00
Thilo Graf
d5bc5bd22c Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 60fed9cc02
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-10 (Wed, 10 May 2017)


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

------------------
This commit was generated by Migit
2017-05-10 10:45:28 +02:00
vanhofen
631df29056 locale: small changes in EPG Plus titles
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3b53914eba
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-09 (Tue, 09 May 2017)

Origin message was:
------------------
- locale: small changes in EPG Plus titles

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

------------------
This commit was generated by Migit
2017-05-09 14:05:32 +02:00
vanhofen
355698c6f4 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale


Origin commit data
------------------
Branch: ni/coolstream
Commit: 66e3c79ee1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-09 (Tue, 09 May 2017)



------------------
This commit was generated by Migit
2017-05-09 13:19:56 +02:00
vanhofen
ab7e287bdf locale: minor changes in EPG-Plus locales
Origin commit data
------------------
Branch: ni/coolstream
Commit: 468fbcd79c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-09 (Tue, 09 May 2017)

Origin message was:
------------------
- locale: minor changes in EPG-Plus locales

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

------------------
This commit was generated by Migit
2017-05-09 11:40:32 +02:00
vanhofen
58f78c306b icons: add new icons for epg-button
Origin commit data
------------------
Branch: ni/coolstream
Commit: b44a047e7e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)

Origin message was:
------------------
- icons: add new icons for epg-button

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

------------------
This commit was generated by Migit
2017-05-08 17:39:34 +02:00
vanhofen
1606092aa6 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a0624cf4a1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-08 14:32:18 +02:00
Michael Liebmann
839daf7d73 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: f0ae55707a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-04-08 (Sat, 08 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-08 14:17:34 +02:00