diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-06-06 11:09:00 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-06-06 11:09:00 -0300 |
| commit | 954256268afe89b648d356ee0b296a9e97a07373 (patch) | |
| tree | 36c42fb01f05d26bbae438d470676c9487b47a04 /version.py | |
| parent | 0e1510214a7585d5446f06344468ab52298cfa81 (diff) | |
| parent | ab99671bb835a5fe24a092ec34afe1ad862ac254 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
demos/2d/motion/engine.cfg
Diffstat (limited to 'version.py')
| -rw-r--r-- | version.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/version.py b/version.py index 348b6b89ed..c723dd2935 100644 --- a/version.py +++ b/version.py @@ -2,6 +2,6 @@ short_name="godot" name="Godot Engine" major=1 minor=1 -status="rc3" +status="stable" |