Files
recycled-ni-neutrino/lib/sectionsdclient
Stefan Seyfried 31c7317205 Merge remote-tracking branch 'check/cst-next'
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 66adad0811
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-07 (Sat, 07 Feb 2015)



------------------
This commit was generated by Migit
2015-02-07 23:12:01 +01:00
..