Commit Graph

245 Commits

Author SHA1 Message Date
gixxpunk
3287a5ded5 re-add missing include
Origin commit data
------------------
Branch: ni/coolstream
Commit: 940569fb9e
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-08-26 (Sat, 26 Aug 2017)

Origin message was:
------------------
- re-add missing include

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

------------------
This commit was generated by Migit
2017-08-26 12:38:16 +02:00
vanhofen
7ec5908e8e remove possibility to change iconsets for infoviewer
Origin commit data
------------------
Branch: ni/coolstream
Commit: ae9435f75d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-26 (Sat, 26 Aug 2017)

Origin message was:
------------------
- remove possibility to change iconsets for infoviewer

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

------------------
This commit was generated by Migit
2017-08-26 10:19:37 +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
5e3d70752b COsdSetup: add slot to ensure clean up icon cache on changed resolution.
Some old icon data makes no sense with changed resolution.
In some cases it could happens that no icons are to see on screen
after changed resolution. This should fix this,


Origin commit data
------------------
Branch: ni/coolstream
Commit: 58d4f13bb7
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
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
48db0bd94c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac
	data/icons/filetypes/mp3.png
	data/icons/filetypes/picture.png
	src/gui/audioplayer.cpp
	src/gui/bouquetlist.cpp
	src/gui/filebrowser.cpp
	src/gui/followscreenings.cpp
	src/gui/followscreenings.h
	src/gui/osd_setup.cpp
	src/gui/record_setup.cpp
	src/neutrino.cpp


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



------------------
This commit was generated by Migit
2017-06-07 15:14:51 +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
71f9b0fd85 filebrowser: use a bit larger regular font by default
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- filebrowser: use a bit larger regular font by default

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


------------------
This commit was generated by Migit
2017-06-07 14:17:11 +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
ed2dc5803f filebrowser: use a bit larger regular font by default
Origin commit data
------------------
Branch: ni/coolstream
Commit: b1b6994fd7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)

Origin message was:
------------------
- filebrowser: use a bit larger regular font by default

------------------
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
d89ecbdf4d osd_setup: move unused fonts away from users choice
Origin commit data
------------------
Branch: ni/coolstream
Commit: c367becaec
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)

Origin message was:
------------------
- osd_setup: move unused fonts away from users choice

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

------------------
This commit was generated by Migit
2017-05-23 18:21:51 +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
gixxpunk
3ace53ce3e Merge branch 'master' of github.com:tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8f3783987a
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-04-26 (Wed, 26 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-26 11:17:46 +02:00
Thilo Graf
0dfbcf92a9 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8554722323
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-25 (Tue, 25 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-25 11:46:41 +02:00
Thilo Graf
9ddf91b410 COsdSetup: reset channellist objects after changed window size
Ensures complete reinit of relevent modules inside channellist instance.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4de8c61c04
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-24 (Mon, 24 Apr 2017)



------------------
This commit was generated by Migit
2017-04-25 11:36:49 +02:00
Michael Liebmann
ff006b3f62 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2afb8fef86
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-04-16 (Sun, 16 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-16 19:42:14 +02:00
vanhofen
5bc6b7c1a1 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/channellist.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c12bba6e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-13 (Thu, 13 Apr 2017)



------------------
This commit was generated by Migit
2017-04-13 10:02:31 +02:00
vanhofen
cca8fbd285 osd_setup: a bit smaller font for epgplus-items; ...
it's now aligned to epgview's fontsizes


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a17b434b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-12 (Wed, 12 Apr 2017)

Origin message was:
------------------
- osd_setup: a bit smaller font for epgplus-items; ...

it's now aligned to epgview's fontsizes


------------------
This commit was generated by Migit
2017-04-12 09:31:22 +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
vanhofen
4df1b65ec0 osd_setup: add new epgplus font
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7b7430969a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)

Origin message was:
------------------
- osd_setup: add new epgplus font

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

------------------
This commit was generated by Migit
2017-04-08 14:11:28 +02:00
vanhofen
c3245e8661 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: e7ff6d5493
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)



------------------
This commit was generated by Migit
2017-03-12 21:59:40 +01:00
Michael Liebmann
e7d1a44693 Revert "- allow to force given osd resolution in "videosystem = auto" mode"
This reverts commit f3fe4a116f.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ce34d5cf9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-12 (Sun, 12 Mar 2017)



------------------
This commit was generated by Migit
2017-03-12 06:32:52 +01:00
vanhofen
73014e6c83 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 66cbc06b01
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)



------------------
This commit was generated by Migit
2017-03-06 23:54:02 +01:00
vanhofen
f3fe4a116f allow to force given osd resolution in "videosystem = auto" mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6fc24e990b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
- allow to force given osd resolution in "videosystem = auto" mode

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

------------------
This commit was generated by Migit
2017-03-06 23:50:15 +01:00
vanhofen
bf56f9f0bc Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7829247fe8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)



------------------
This commit was generated by Migit
2017-02-28 15:36:23 +01:00
Michael Liebmann
ff6188530e osd resolution: Use COsdHelpers::changeOsdResolution() to adjust...
...OSD resolution after switching video format


Origin commit data
------------------
Branch: ni/coolstream
Commit: ff11dd44ab
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-28 (Tue, 28 Feb 2017)



------------------
This commit was generated by Migit
2017-02-28 15:04:09 +01:00
Michael Liebmann
788a0d9f3d osd resolution: Add src/gui/osd_helpers.cpp
- Move switch osd resolution from COsdSetup::changeNotify() to
 COsdHelpers::changeOsdResolution()


Origin commit data
------------------
Branch: ni/coolstream
Commit: 84b2af00fb
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-28 (Tue, 28 Feb 2017)

Origin message was:
------------------
osd resolution: Add src/gui/osd_helpers.cpp

 - Move switch osd resolution from COsdSetup::changeNotify() to
  COsdHelpers::changeOsdResolution()


------------------
This commit was generated by Migit
2017-02-28 15:04:08 +01:00
vanhofen
315955cc0d Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/osd_setup.cpp
	src/neutrino.cpp
	src/neutrino.h
	src/system/locals.h
	src/system/locals_intern.h


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



------------------
This commit was generated by Migit
2017-02-13 21:41:04 +01:00
Michael Liebmann
3903507312 neutrino: Add switch osd resolution when supported from hardware
- At the moment supported hardware: CS HD2

 Currently known problems:
 -------------------------
 - Display menus after changing resolution (Reboot required)
 - Display headers after changing resolution hd => fullhd (Reboot required)
 - Display infobar after changing resolution hd => fullhd (Reboot required)
 - Screenshot broken (With new driver and set resolution to 1280x720)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7b158903f8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-13 (Mon, 13 Feb 2017)

Origin message was:
------------------
neutrino: Add switch osd resolution when supported from hardware

 - At the moment supported hardware: CS HD2

 Currently known problems:
 -------------------------
 - Display menus after changing resolution (Reboot required)
 - Display headers after changing resolution hd => fullhd (Reboot required)
 - Display infobar after changing resolution hd => fullhd (Reboot required)
 - Screenshot broken (With new driver and set resolution to 1280x720)


------------------
This commit was generated by Migit
2017-02-13 12:51:14 +01:00
vanhofen
b9b5808928 NI-code: Rename hardware defined macros for coolstream stb
Origin commit data
------------------
Branch: ni/coolstream
Commit: f02c3dc1db
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
- NI-code: Rename hardware defined macros for coolstream stb

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

------------------
This commit was generated by Migit
2017-02-12 21:57:06 +01:00
vanhofen
ab0fdc2825 Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 25f1346ad7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)



------------------
This commit was generated by Migit
2017-02-09 20:22:37 +01:00
vanhofen
050a0c720c rename screen_x/yres to font_scaling_x/y
Origin commit data
------------------
Branch: ni/coolstream
Commit: aeec37af89
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-12 (Thu, 12 Jan 2017)

Origin message was:
------------------
- rename screen_x/yres to font_scaling_x/y

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

------------------
This commit was generated by Migit
2017-02-09 18:13:19 +01:00
Michael Liebmann
73076ba2cb Remove obsolete 'contrast_fonts' code from osd menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6803a8dff3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-24 (Tue, 24 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-31 16:36:40 +01:00
vanhofen
eccc57e073 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/components/cc_detailsline.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 609d466302
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)



------------------
This commit was generated by Migit
2017-01-30 16:32:43 +01:00
Michael Liebmann
e41f297068 CMoviePlayerGui: Bind enable/disable FileTime to enableInfoClock()
Origin commit data
------------------
Branch: ni/coolstream
Commit: dc4ce280ed
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-30 (Mon, 30 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-30 07:15:46 +01:00
vanhofen
37030339ad Merge branch 'pu/font' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/screensaver.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 47d0b6efb5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-25 (Wed, 25 Jan 2017)



------------------
This commit was generated by Migit
2017-01-25 21:02:22 +01:00
Michael Liebmann
a71c444da3 Remove obsolete 'contrast_fonts' code from osd menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: c741d46b63
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-24 (Tue, 24 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-25 16:33:45 +01:00
vanhofen
ab1e072620 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c2506804b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-30 (Fri, 30 Dec 2016)



------------------
This commit was generated by Migit
2016-12-30 21:54:46 +01:00
Thilo Graf
fb4d202f8e settings: add explicit button font
Fonts for menu foot and button font are not not necessarily the same thing.

TODO: locales


Origin commit data
------------------
Branch: ni/coolstream
Commit: 65ac231940
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)



------------------
This commit was generated by Migit
2016-12-30 20:33:26 +01:00
vanhofen
107026cb75 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/themes.cpp
	src/neutrino.cpp
	src/system/settings.h
	version_pseudo.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4f2d36fe3e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)



------------------
This commit was generated by Migit
2016-12-29 00:59:00 +01:00
vanhofen
ea250639ac themes: allow progressbar-settings in themes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 888bfb6687
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)

Origin message was:
------------------
- themes: allow progressbar-settings in themes

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

------------------
This commit was generated by Migit
2016-12-29 00:47:34 +01:00
vanhofen
0e53910d95 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 00c8eebe8a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-27 (Tue, 27 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-27 16:04:31 +01:00
vanhofen
e75af63e18 osd-setup: allow higher osd-timeouts; up to 240 sec. now
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6370ceb010
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-27 (Tue, 27 Dec 2016)

Origin message was:
------------------
- osd-setup: allow higher osd-timeouts; up to 240 sec. now

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

------------------
This commit was generated by Migit
2016-12-27 14:21:29 +01:00
FlatTV
902cc57d77 OSD Menu: Add progressbar color
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2570e06e7d
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-12-26 (Mon, 26 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-26 14:58:51 +01:00
vanhofen
b227cefce0 infoviewer_bb: disable broken infobar_casystem_dotmatrix code
Origin commit data
------------------
Branch: ni/coolstream
Commit: b197cf2dba
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)

Origin message was:
------------------
- infoviewer_bb: disable broken infobar_casystem_dotmatrix code

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

------------------
This commit was generated by Migit
2016-12-12 11:25:42 +01:00
vanhofen
8557049e2e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: d78bb26321
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-09 (Fri, 09 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-09 17:20:52 +01:00
Jacek Jendrzej
6bd4a31a31 src/gui/osd_setup.cpp fix menu item (possible segfault)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2649e909df
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-12-09 (Fri, 09 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-09 16:16:02 +01:00
vanhofen
243909caf8 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: ad1e3beb3d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-02 (Fri, 02 Dec 2016)



------------------
This commit was generated by Migit
2016-12-02 22:00:25 +01:00