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

fix conflict

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 68201bad9e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-16 (Fri, 16 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-16 14:11:06 +04:00
parent 8ef59f34ce b1386e14c7
commit f7d6d1efc9
6 changed files with 81 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/infoviewer.h
View File

@@ -186,6 +186,7 @@ class CInfoViewer
int handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data);
void clearVirtualZapMode() {virtual_zap_mode = false;}
void changePB();
bool SDT_freq_update;
};
class CInfoViewerHandler : public CMenuTarget