From b15945655f10af28d64dc41a255f3dc720efb48b Mon Sep 17 00:00:00 2001
From: rautenberg <rautenberg@in-silico.ch>
Date: Thu, 20 Oct 2016 09:45:47 +0200
Subject: merge development to master and version bump

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'VERSION')

diff --git a/VERSION b/VERSION
index bcab45a..3eefcb9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.0.3
+1.0.0
-- 
cgit v1.2.3