Merge branch 'release/v.1.0.2' into develop

ttadano · Jan 29, 2018 · 40c0bb1 · 40c0bb1
2 parents 226b236 + 7b63113
commit 40c0bb1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -62,7 +62,7 @@
 # The short X.Y version.
 version = '1.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.0.0'
+release = '1.0.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/include/version.h b/include/version.h
@@ -12,4 +12,4 @@
 
 #include <string>
 
-static const std::string ALAMODE_VERSION = "1.0.0";
+static const std::string ALAMODE_VERSION = "1.0.2";