aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/diceParser.pro
diff options
context:
space:
mode:
authorRenaud G <renaud@rolisteam.org>2016-09-25 10:04:28 +0200
committerRenaud G <renaud@rolisteam.org>2016-09-25 10:04:28 +0200
commitfac053c3aacc0e2ede8a85ff41e27eed1c360f6f (patch)
treec91ff176e60f1f6e634107b4e7a7282e831975ee /diceParser.pro
parentdbb57d52d351e340ce69fccaedbdf758b04ed8fe (diff)
parente225f2edfd365d1709df2cb5bb2f752ec8d82c1c (diff)
downloadOneRoll-fac053c3aacc0e2ede8a85ff41e27eed1c360f6f.tar.gz
OneRoll-fac053c3aacc0e2ede8a85ff41e27eed1c360f6f.zip
Merge branch 'master' of github.com:Rolisteam/DiceParser
Diffstat (limited to 'diceParser.pro')
-rw-r--r--diceParser.pro8
1 files changed, 5 insertions, 3 deletions
diff --git a/diceParser.pro b/diceParser.pro
index 3a95496..2b5f3fd 100644
--- a/diceParser.pro
+++ b/diceParser.pro
@@ -21,7 +21,7 @@ TEMPLATE = app
CONFIG+= CLI
CLI {
DEFINES += CLI
-include(cli/cli.pri)cd
+include(cli/cli.pri)
}
IRC {
include(irc/irc.pri)
@@ -46,7 +46,8 @@ SOURCES += diceparser.cpp \
result/scalarresult.cpp \
parsingtoolbox.cpp \
result/stringresult.cpp \
- dicealias.cpp
+ dicealias.cpp \
+ mobile/mainwindow.cpp
HEADERS += \
@@ -60,7 +61,8 @@ HEADERS += \
result/scalarresult.h \
result/parsingtoolbox.h \
result/stringresult.h \
- dicealias.h
+ dicealias.h \
+ mobile/mainwindow.h
OTHER_FILES += README.md \
HelpMe.md