aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/diceParser.pro
diff options
context:
space:
mode:
authorRenaud G <renaud@rolisteam.org>2016-09-16 20:35:32 +0200
committerRenaud G <renaud@rolisteam.org>2016-09-16 20:35:32 +0200
commitd3b6bce4937a4589708281b6cee46fe827a0c18d (patch)
tree80a89bfc69d28b9085eddbcfe0667bd94039d6b1 /diceParser.pro
parent70e09294fca1022d9370fe2fd631a98480c284b2 (diff)
parentb060740c162d5b5aa07e4f7dd28b155f951fd971 (diff)
downloadOneRoll-d3b6bce4937a4589708281b6cee46fe827a0c18d.tar.gz
OneRoll-d3b6bce4937a4589708281b6cee46fe827a0c18d.zip
Merge branch 'master' of github.com:Rolisteam/DiceParser
Diffstat (limited to 'diceParser.pro')
-rw-r--r--diceParser.pro6
1 files changed, 4 insertions, 2 deletions
diff --git a/diceParser.pro b/diceParser.pro
index 6a1072d..2b5f3fd 100644
--- a/diceParser.pro
+++ b/diceParser.pro
@@ -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