From 536ba83d1ee1daf44f8c7d5f67fb55dcce696743 Mon Sep 17 00:00:00 2001
From: Renaud G <renaud@rolisteam.org>
Date: Thu, 24 Dec 2015 11:20:13 +0100
Subject: -Adding rules to compile new file.

---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

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
-- 
cgit v1.2.3-70-g09d2