fix conflicts

This commit is contained in:
[CST] Focus
2012-03-20 11:07:28 +04:00
25 changed files with 821 additions and 358 deletions

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);