mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 17:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix conflict

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 55f29c5daf
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-07 (Wed, 07 Mar 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2012-03-07 17:55:10 +04:00
parent 5f7d6d49a2 938f123e35
commit aed3837e48
21 changed files with 49 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/motorcontrol.cpp
View File

@@ -714,7 +714,7 @@ void CMotorControl::showSNR()
int barwidth = 100;
uint16_t ssig, ssnr;
int sig, snr;
int bheight, posx, posy;
int posx, posy;
int sw;
@@ -728,7 +728,6 @@ void CMotorControl::showSNR()
g_sig = ssig & 0xFFFF;
g_snr = snr;
bheight = mheight - 5;
posy = y + height - mheight - 5;
if (lastsig != sig) {