Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source

Conflicts:
	src/gui/widget/keychooser.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: a529a43164
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)



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

...

This commit is contained in:

vanhofen

2017-09-15 18:26:42 +02:00

parent ed0a6297c9 c27de33335

commit c2e72b711c

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