# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1585731680 -7200
# Node ID 5466d9340fc7920deb89c2ec9a4a357d0a0b049a
# Parent  2ec8e4cb93d39ca402323ab2f0f8d9fdc7f91d2c# Parent  0977f515286103c39034aaeaa2989d488dc3b0e5
merge

diff -r 0977f5152861 -r 5466d9340fc7 CMakeLists.txt
--- a/CMakeLists.txt	Wed Apr 01 11:01:07 2020 +0200
+++ b/CMakeLists.txt	Wed Apr 01 11:01:20 2020 +0200
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.8)
 project(OrthancPython)
 
-set(PLUGIN_VERSION "1.0")
+set(PLUGIN_VERSION "mainline")
 
 
 set(PYTHON_VERSION "3.6" CACHE STRING "Version of Python to be used")