Commit Graph

2 Commits

Author SHA1 Message Date
vanhofen
b9d92abc00 NIyWeb: fix display of imageinfo ...
and disable online check; needs several fixes


Origin commit data
------------------
Branch: ni/coolstream
Commit: 477c394f29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-23 (Fri, 23 Dec 2016)

Origin message was:
------------------
- NIyWeb: fix display of imageinfo ...

and disable online check; needs several fixes


------------------
This commit was generated by Migit
2016-12-23 23:40:24 +01:00
vanhofen
42a7ef830b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
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
2016-12-15 14:12:33 +01:00