vuplus: relevant pids routing

Conflicts:
	src/neutrino.cpp
	src/system/settings.h
	src/zapit/include/zapit/zapit.h
	src/zapit/src/zapit.cpp

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

fixes named: "vuplus: relevant pids routing - fix" are included
This commit is contained in:
BPanther
2020-01-18 11:36:58 +01:00
committed by Thilo Graf
parent 75e7bc7b28
commit 55bbe2c364
9 changed files with 143 additions and 94 deletions

View File

@@ -349,6 +349,7 @@ const char * locale_real_names[] =
"ci.removed",
"ci.reset",
"ci.reset_standby",
"ci.rpr",
"ci.save_pincode",
"ci.settings",
"ci.timeout",