Commit Graph

5 Commits

Author SHA1 Message Date
Stefan Seyfried
7254e280e3 Merge branch 'check/pu-cc' into master
needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/framebuffer.h
	src/driver/volume.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/filebrowser.cpp
	src/gui/imageinfo.cpp
	src/gui/infoviewer.cpp
	src/gui/streaminfo2.cpp
	src/gui/widget/textbox.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ad0b6b6dc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)



------------------
This commit was generated by Migit
2013-04-06 11:21:55 +02:00
Thilo Graf
6d6cf7e177 fix license text, sorry, was a c&p error
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0dc4686874
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-03-20 (Wed, 20 Mar 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-03-21 11:37:00 +01:00
Stefan Seyfried
070ca8469d make the extupdate build conditional
extupdate is not very useful for most platforms, so only
build it if --enable-extupdate is passed to configure


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5b72a7fe3c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-22 (Fri, 22 Feb 2013)



------------------
This commit was generated by Migit
2013-02-22 17:14:38 +01:00
Jacek Jendrzej
e1509315bd src/gui/update_ext.h: supplement to 76a0ef0797
Origin commit data
------------------
Branch: ni/coolstream
Commit: 30436f353d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-16 (Wed, 16 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-16 12:03:40 +01:00
Thilo Graf
76a0ef0797 extended update: move ext_update.* to update_ext.*
Beware the canonical order of filenames.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9939fc9197
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-01-13 (Sun, 13 Jan 2013)



------------------
This commit was generated by Migit
2013-01-14 15:31:43 +01:00