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

fix conflicts

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d39b174c75
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-20 (Tue, 20 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-20 11:07:28 +04:00
parent f7d6d1efc9 fe432d2c0c
commit 8b4daf875c
25 changed files with 821 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/test_menu.cpp
View File

@@ -49,6 +49,7 @@
#include "gui/scan.h"
#include "gui/scan_setup.h"
#include <zapit/femanager.h>
#include <gui/widget/messagebox.h>
extern int cs_test_card(int unit, char * str);