Merge branch 'ni/tuxbox' of bitbucket.org:neutrino-images/ni-neutrino-hd into ni/tuxbox

Browse Source

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8a9ddb86ab
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-22 (Tue, 22 Nov 2016)



------------------
This commit was generated by Migit

...

This commit is contained in:

vanhofen

2016-11-22 23:59:48 +01:00

parent 0b8c62cd41 e212c21bf9

commit d94d443226

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available