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

Conflicts:
	configure.ac
	data/Makefile.am
	data/icons/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1b9b466bc1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)



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

2016-12-07 10:55:25 +01:00

..

backgrounds

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

2016-12-07 10:55:25 +01:00

screensaver

icons: move icons into categorized subdirectories

2016-12-07 10:36:47 +01:00

Makefile.am

icons: move icons into categorized subdirectories

2016-12-07 10:36:47 +01:00