fix conflict

This commit is contained in:
[CST] Focus
2012-03-16 14:11:06 +04:00
6 changed files with 81 additions and 44 deletions

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