summaryrefslogtreecommitdiff
path: root/version.py
diff options
context:
space:
mode:
authorAnton Yabchinskiy <arn@bestmx.ru>2014-12-09 17:51:14 +0300
committerAnton Yabchinskiy <arn@bestmx.ru>2014-12-09 17:51:14 +0300
commitff755f93eb86e3f7f6801918457ca77a3001671b (patch)
tree58d6def002b427db665a504f08d25eae335bd9d9 /version.py
parentd45be7d9f43046365fcfbf97420f9eca636c51e7 (diff)
parentbe4e40e90a5a322f6a7cec4893854ef5b15db600 (diff)
Merge branch 'master' of http://github.com/okamstudio/godot
Diffstat (limited to 'version.py')
-rw-r--r--version.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/version.py b/version.py
index a0e92c6016..1e88d24e54 100644
--- a/version.py
+++ b/version.py
@@ -2,6 +2,6 @@ short_name="godot"
name="Godot Engine"
major=1
minor=0
-status="rc1"
+status="rc2"