mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-17 10:23:37 +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


Origin commit data
------------------
Commit: 8b689f4b26
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
This commit is contained in:
Stefan Seyfried
2013-04-06 14:28:16 +02:00
parent 619d1f2c69 32075530f5
commit f0f32ff08f
42 changed files with 861 additions and 738 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/scan.h
View File

@@ -33,11 +33,11 @@
#define __scants__
#include <gui/widget/menue.h>
#include <gui/widget/progressbar.h>
#include <gui/components/cc_item_progressbar.h>
#include <driver/framebuffer.h>
#include <system/localize.h>
#include <string>
#include <system/settings.h>
class CScanTs : public CMenuTarget
{