summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2015-05-29 13:15:47 +0200
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2015-05-29 13:15:47 +0200
commit9f86a4c3f20ac8785f80288ec4cdefe79ed67e68 (patch)
treede8153fb6481096f21bc0056d552571662df0071 /include
parent0f314f9fb219157ed3988ee08e0a8132301105ff (diff)
parent7a4cfe2e5fe384691f0516020b2fcd48b35a7f63 (diff)
downloadastra-9f86a4c3f20ac8785f80288ec4cdefe79ed67e68.tar.gz
astra-9f86a4c3f20ac8785f80288ec4cdefe79ed67e68.tar.bz2
astra-9f86a4c3f20ac8785f80288ec4cdefe79ed67e68.tar.xz
astra-9f86a4c3f20ac8785f80288ec4cdefe79ed67e68.zip
Merge branch 'master'
Diffstat (limited to 'include')
-rw-r--r--include/astra/Globals.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/astra/Globals.h b/include/astra/Globals.h
index 9c8ddfb..4de07d1 100644
--- a/include/astra/Globals.h
+++ b/include/astra/Globals.h
@@ -61,9 +61,9 @@ $Id$
// macro's
#define ASTRA_TOOLBOXVERSION_MAJOR 1
-#define ASTRA_TOOLBOXVERSION_MINOR 5
+#define ASTRA_TOOLBOXVERSION_MINOR 6
#define ASTRA_TOOLBOXVERSION ((ASTRA_TOOLBOXVERSION_MAJOR)*100 + (ASTRA_TOOLBOXVERSION_MINOR))
-#define ASTRA_TOOLBOXVERSION_STRING "1.5"
+#define ASTRA_TOOLBOXVERSION_STRING "1.6"
#define ASTRA_ASSERT(a) assert(a)