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

Merge branch 'uncool/dvbsi++' commit 4965619a79

Browse Source 
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
This commit is contained in:
Stefan Seyfried
2012-12-30 21:35:20 +01:00
parent 231499a078 8dcd92d557
commit f8f5467fdb
84 changed files with 898 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/widget/progresswindow.cpp
View File

@@ -169,7 +169,7 @@ void CProgressWindow::paint()
ypos+= mheight;
globalstatusY = ypos+ mheight-20;
ypos+= mheight >>1;
//ypos+= mheight >>1;
showGlobalStatus(global_progress);
}