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

Browse Source

Conflicts:
	src/gui/widget/menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: fe645c6114
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)



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

...

This commit is contained in:

vanhofen

2017-10-01 23:33:28 +02:00

parent d50e1b6cc0 61a2b10f7e

commit 6e4cd9f08c

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