parental protection: make zaptime configurable

Conflicts:
	data/locale/english.locale
	src/gui/channellist.cpp
	src/gui/parentallock_setup.cpp
	src/neutrino.cpp
This commit is contained in:
martii
2013-06-23 08:40:35 +02:00
committed by [CST] Focus
parent 493098040d
commit a12f4c0274
8 changed files with 12 additions and 7 deletions

View File

@@ -568,6 +568,7 @@ struct SNeutrinoSettings
int parentallock_prompt;
int parentallock_lockage;
int parentallock_defaultlocked;
int parentallock_zaptime;
std::string parentallock_pincode;