recycled-ni-neutrino

mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 01:11:06 +02:00

Files

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

daemonc

remove obsolete embedded libtriple

2013-03-06 17:23:46 +01:00

driver

Merge branch 'check/pu-cc' into master

2013-04-06 11:21:55 +02:00

eitd

neutrino: fix most hardcoded paths

2013-03-11 13:32:06 +01:00

gui

Merge branch 'check/pu-cc' into master