diff options
| author |   Renaud G <renaud@rolisteam.org> | 2016-01-17 01:57:39 +0100 |
|---|---|---|
| committer | Renaud G <renaud@rolisteam.org> | 2016-01-17 01:57:39 +0100 |
| commit | c9df65aae8ca3234b5ec4abe08e687e1d2cd07bc (patch) | |
| tree | 65605d2b5930d80c24d6aa9807c39e46a789c340 /diceparser.pri | |
| parent | 239051eff0ca6f28a4143c0f680c2600b2b0cb64 (diff) | |
| parent | 7df15a3d41d87bbed9155a5cff2fda70acbf2f0e (diff) | |
| download | OneRoll-c9df65aae8ca3234b5ec4abe08e687e1d2cd07bc.tar.gz OneRoll-c9df65aae8ca3234b5ec4abe08e687e1d2cd07bc.zip | |
Merge branch 'master' of github.com:Rolisteam/DiceParser
Diffstat (limited to 'diceparser.pri')
| -rw-r--r-- | diceparser.pri | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/diceparser.pri b/diceparser.pri index 9fe29e3..912776c 100644 --- a/diceparser.pri +++ b/diceparser.pri @@ -48,6 +48,7 @@ HEADERS += \ $$PWD/node/parenthesesnode.h \ $$PWD/node/helpnode.h \ $$PWD/node/jumpbackwardnode.h \ + $$PWD/node/mergenode.h \ $$PWD/node/listaliasnode.h \ $$PWD/node/listsetrollnode.h @@ -65,6 +66,7 @@ SOURCES += \ $$PWD/node/parenthesesnode.cpp \ $$PWD/node/helpnode.cpp \ $$PWD/node/jumpbackwardnode.cpp \ + $$PWD/node/mergenode.cpp \ $$PWD/node/listaliasnode.cpp \ $$PWD/node/listsetrollnode.cpp |