diff options
| author | Jonathan Bauer | 2011-02-01 16:51:20 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2011-02-01 16:51:20 +0100 |
| commit | 3feceb97b39f3f92eed9d483dba450b30ef84d39 (patch) | |
| tree | 053665b2124716ad4a7dfb26fcc79ac93c8330cd /src/fbgui.pro | |
| parent | Merge branch 'master' of git.openslx.org:lsfks/master-teamprojekt/fbgui (diff) | |
| download | fbgui-3feceb97b39f3f92eed9d483dba450b30ef84d39.tar.gz fbgui-3feceb97b39f3f92eed9d483dba450b30ef84d39.tar.xz fbgui-3feceb97b39f3f92eed9d483dba450b30ef84d39.zip | |
fix
Diffstat (limited to 'src/fbgui.pro')
| -rw-r--r-- | src/fbgui.pro | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/fbgui.pro b/src/fbgui.pro index 5a4deea..551941b 100644 --- a/src/fbgui.pro +++ b/src/fbgui.pro @@ -6,18 +6,12 @@ QT += core \ gui \ webkit \ network -<<<<<<< HEAD -HEADERS += fbbrowser.h \ - downloadmanager.h -SOURCES += fbgui.cpp \ - fbbrowser.cpp \ - downloadmanager.cpp -======= HEADERS += jsObject.h \ - fbbrowser.h + downloadmanager.h \ + fbbrowser.h SOURCES += jsObject.cpp \ fbgui.cpp \ + downloadmanager.cpp \ fbbrowser.cpp ->>>>>>> a1c5fea9ed618b296548560d5806d99448cca262 FORMS += fbbrowser.ui RESOURCES += fbgui.qrc |