Files
recycled-ni-neutrino/data/locale
BPanther 0e01ee36a3 vuplus: dvb wait delay for ci response
Conflicts:
	src/gui/cam_menu.cpp
	src/neutrino.cpp


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



------------------
This commit was generated by Migit
2020-01-18 00:07:39 +01:00
..
2017-09-16 12:53:03 +02:00
2018-10-16 23:57:28 +02:00