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

Browse Source

Conflicts:
	configure.ac


Origin commit data
------------------
Branch: ni/coolstream
Commit: 624691ea0d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)



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

...

This commit is contained in:

vanhofen

2016-12-15 14:12:33 +01:00

parent 39c2751a05 906bd56e8f

commit 42a7ef830b

284 changed files with 47 additions and 440 deletions

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

12

data/y-web/jquery/jquery-ui.min.js vendored Normal file

File diff suppressed because one or more lines are too long