aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/node/node.pri
diff options
context:
space:
mode:
authorRenaud G <renaud@rolisteam.org>2015-03-31 23:53:25 +0200
committerRenaud G <renaud@rolisteam.org>2015-03-31 23:53:25 +0200
commit5bd5a8a07a900c013c120b4e228c766a84a05b09 (patch)
treeba9b3fa5ce6e81ab8ecd2c66073fa1911e9b8568 /node/node.pri
parent4c9a68db5423c5d798d178d4dafb5bf8e3228ed1 (diff)
parenta03f73495bc6ce71630129a92408a26f81ae301f (diff)
downloadOneRoll-5bd5a8a07a900c013c120b4e228c766a84a05b09.tar.gz
OneRoll-5bd5a8a07a900c013c120b4e228c766a84a05b09.zip
Merge branch 'master' of github.com:obiwankennedy/DiceParser
Conflicts: node/node.pri
Diffstat (limited to 'node/node.pri')
-rw-r--r--node/node.pri2
1 files changed, 2 insertions, 0 deletions
diff --git a/node/node.pri b/node/node.pri
index 79c1623..d7f5c7c 100644
--- a/node/node.pri
+++ b/node/node.pri
@@ -13,6 +13,7 @@ HEADERS += \
$$PWD/helpnode.h \
$$PWD/jumpbackwardnode.h \
$$PWD/listsetrollnode.h
+ $$PWD/listaliasnode.h
SOURCES += \
$$PWD/dicerollernode.cpp \
@@ -29,3 +30,4 @@ SOURCES += \
$$PWD/helpnode.cpp \
$$PWD/jumpbackwardnode.cpp \
$$PWD/listsetrollnode.cpp
+ $$PWD/listaliasnode.cpp