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 /CMakeLists.txt | |
| 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 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9aae367..977d1f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,6 +38,7 @@ add_executable( node/executionnode.cpp node/explosedicenode.cpp node/helpnode.cpp + node/mergenode.cpp node/jumpbackwardnode.cpp node/keepdiceexecnode.cpp node/listaliasnode.cpp |