mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-15 01:13:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/gui/movieplayer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c188cf3683
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-26 (Sun, 26 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-26 22:35:47 +01:00
parent 2623c0d848 9ca012f83a
commit dff4ea2892
13 changed files with 454 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/buildinfo.cpp
View File

@@ -37,7 +37,7 @@
using namespace std;
CBuildInfo::CBuildInfo(bool show) : CComponentsWindow(0, 0, 700, 500, LOCALE_BUILDINFO_MENU, NEUTRINO_ICON_INFO)
CBuildInfo::CBuildInfo(bool show) : CComponentsWindow(0, 0, 90/*%*/, 90/*%*/, LOCALE_BUILDINFO_MENU, NEUTRINO_ICON_INFO)
{
initVarBuildInfo();
if (show)