vuplus: relevant pids routing

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9b5d99819b
Author: BPanther <bpanther_ts@hotmail.com>
Date: 2020-01-18 (Sat, 18 Jan 2020)



------------------
This commit was generated by Migit
This commit is contained in:
BPanther
2020-01-18 11:36:58 +01:00
committed by vanhofen
parent 5e0c316c0c
commit ba4b2c60dd
9 changed files with 34 additions and 17 deletions

View File

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