vanhofen 28376259c1 Merge branch 'master' into pu/mp ...

Conflicts:
	src/gui/epgplus.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 064f693bf7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)



------------------
This commit was generated by Migit

2017-04-08 14:36:12 +02:00

..

helpers

fix create-locals-work helper script

2016-05-13 19:14:17 +02:00

unmaintained

Remove obsolete 'contrast_fonts' code from osd menu

2017-01-31 16:36:40 +01:00

_readme.txt

add and use LOCALEDIR variable; move LOCALEDIR_VAR to global.h

2015-05-06 22:58:54 +02:00

deutsch.locale

Merge branch 'master' into pu/mp

2017-04-08 14:36:12 +02:00

english.locale

Merge branch 'master' into pu/mp

2017-04-08 14:36:12 +02:00

Makefile.am

locale: fix "make work-locals"

2016-01-03 16:01:12 +01:00

nederlands.locale

Remove obsolete 'contrast_fonts' code from osd menu

2017-01-31 16:36:40 +01:00

slovak.locale

Update slovak.locale

2017-03-15 09:32:43 +01:00