# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1351261097 -7200
# Node ID 7e2b6a463e4f8972161c6b72727c2d2a4ba4d878
# Parent  26250504392914b6f9c40a44acdd464cb16b19aa# Parent  857856b827e532a2729e93991d4d0f656afcf119
merge

diff -r 857856b827e5 -r 7e2b6a463e4f CMakeLists.txt
--- a/CMakeLists.txt	Fri Oct 26 16:15:29 2012 +0200
+++ b/CMakeLists.txt	Fri Oct 26 16:18:17 2012 +0200
@@ -4,7 +4,7 @@
 
 # Version of the build, should always be "mainline" except in release branches
 add_definitions(
-  -DORTHANC_VERSION="0.2.3"
+  -DORTHANC_VERSION="mainline"
   )
 
 # Parameters of the build
diff -r 857856b827e5 -r 7e2b6a463e4f Resources/Configuration.json