summaryrefslogtreecommitdiff
path: root/version.py
diff options
context:
space:
mode:
authorJuan Linietsky <red@kyoko>2015-05-11 15:49:41 -0300
committerJuan Linietsky <red@kyoko>2015-05-11 15:49:41 -0300
commit4b8745ad63409cf14b02735981ee35d2f794421c (patch)
tree607dcfbb77430e8ed7eef25de6b7bec9c4032aec /version.py
parentdda60296d81edaabfdb56f47a2c949b5dad283fb (diff)
parentb777bf5ff5c3891daa0f93987ca12d0d7d053c2b (diff)
Merge branch 'master' of https://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 577bc73208..03c76b704b 100644
--- a/version.py
+++ b/version.py
@@ -2,6 +2,6 @@ short_name="godot"
name="Godot Engine"
major=1
minor=1
-status="rc1"
+status="rc2"