martii fca89727ca parental protection: make zaptime configurable ...

Conflicts:
	data/locale/english.locale
	src/gui/channellist.cpp
	src/gui/parentallock_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: a12f4c0274
Author: martii <m4rtii@gmx.de>
Date: 2013-06-23 (Sun, 23 Jun 2013)

2014-11-11 14:40:52 +03:00

..

fonts

add font with simplified chinese support

2013-06-11 17:46:05 +04:00

icons

plugins: add and use default hint icon; THX to fred_feuerstein

2014-10-08 14:14:24 +04:00

inetradio

…

initial

update initial astra frontend.conf, use same config as default

2013-07-30 11:13:50 +04:00

iso-codes

…

lcd

optimize jpg,png size

2012-08-08 17:10:12 +02:00

license

CImageInfo: rework some parts of imageinfo

2013-11-11 00:20:10 +01:00

locale

parental protection: make zaptime configurable

2014-11-11 14:40:52 +03:00

neutrino-scripts

Software update: Copy flashimage to /tmp if it is not present in this directory

2013-06-13 01:36:03 +02:00

scripts

…

themes

…

cables.xml

data/cables.xml: add ziggo/upc providers

2014-09-25 16:37:21 +04:00

encoding.conf

update encoding.conf

2013-08-08 15:51:47 +02:00

Makefile.am

add basic support for DVB-T

2014-02-28 13:44:22 +04:00

mk_terrestrial_xml.pl

add basic support for DVB-T

2014-02-28 13:44:22 +04:00

providermap.xml

…

satellites.xml

satellites.xml: update freq 12722000 as suggested by Janus

2014-06-06 19:00:25 +02:00

settingsupdate.conf

Software Update with apply the settings (Part13)

2013-01-01 15:05:21 +01:00

terrestrial.xml

add basic support for DVB-T

2014-02-28 13:44:22 +04:00

tobackup.conf

…