summaryrefslogtreecommitdiffstats
path: root/include/astra/Globals.h
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2017-11-22 17:30:28 +0100
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2017-11-22 17:30:28 +0100
commit985057bb58bdb85a31fd883f2651fce9fb3fad16 (patch)
tree69ad722aa934307adcd8cc9834d6437961b3215a /include/astra/Globals.h
parenta527cc9e29cae256bd095b032f34c80957e84907 (diff)
parent231a6de483e94507de34bd2f79317d875bbb354b (diff)
downloadastra-985057bb58bdb85a31fd883f2651fce9fb3fad16.tar.gz
astra-985057bb58bdb85a31fd883f2651fce9fb3fad16.tar.bz2
astra-985057bb58bdb85a31fd883f2651fce9fb3fad16.tar.xz
astra-985057bb58bdb85a31fd883f2651fce9fb3fad16.zip
Merge branch 'master' into parallel_vec
Diffstat (limited to 'include/astra/Globals.h')
-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 2ae1f78..8d0d619 100644
--- a/include/astra/Globals.h
+++ b/include/astra/Globals.h
@@ -58,9 +58,9 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.
// macro's
#define ASTRA_TOOLBOXVERSION_MAJOR 1
-#define ASTRA_TOOLBOXVERSION_MINOR 8
+#define ASTRA_TOOLBOXVERSION_MINOR 9
#define ASTRA_TOOLBOXVERSION ((ASTRA_TOOLBOXVERSION_MAJOR)*100 + (ASTRA_TOOLBOXVERSION_MINOR))
-#define ASTRA_TOOLBOXVERSION_STRING "1.8.3"
+#define ASTRA_TOOLBOXVERSION_STRING "1.9.0dev"
#define ASTRA_ASSERT(a) assert(a)