Merge branch 'release-2.2' into develop

2015-06-27 01:51:29 +03:00 · 2015-06-27 01:51:29 +03:00 · 0dae18d0a0
parent 0dc5c391fb 9021b18940
commit 0dae18d0a0
1 changed files with 1 additions and 1 deletions
--- a/setup.py
+++ b/setup.py
@ -59,7 +59,7 @@ else:


 def get_version():
-	base_version = '2.1.4'
+	base_version = '2.2'
 	base_version += '.dev9999'
 	try:
 		return base_version + '+git.' + str(subprocess.check_output(['git', 'rev-parse', 'HEAD']).strip())