mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 02:11:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'check/pu-cc' into master

Browse Source 
...needs some build- and logical fixing...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/volume.cpp
	src/gui/eventlist.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/gui/timeosd.cpp
	src/gui/widget/progressbar.cpp
	src/gui/widget/progressbar.h
This commit is contained in:
Stefan Seyfried
2013-04-06 14:28:16 +02:00
parent 21cb7fc249 8ba673497e
commit 8b689f4b26
42 changed files with 861 additions and 738 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/infoviewer.h
View File

@@ -42,7 +42,6 @@
#include <system/settings.h>
#include "widget/menue.h"
#include <gui/infoviewer_bb.h>
#include <gui/widget/progressbar.h>
#include <string>
#include <zapit/channel.h>