diff options
author | Juan Linietsky <reduzio@gmail.com> | 2015-10-13 01:19:32 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2015-10-13 01:19:32 -0300 |
commit | b3cda43a0fb49e1cb9c8414077a23fa4b61ede38 (patch) | |
tree | 1fee133b2fbc6f2bade96cc9914a449cbb9dbe1e /tools/editor/project_manager.cpp | |
parent | 52e756752e1db9e4cf7c5bb7e92d44995ad674c4 (diff) | |
parent | aad2bbdb6fb7c8217d7e75480b38e45f00cb3abd (diff) |
Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
platform/windows/detect.py
Diffstat (limited to 'tools/editor/project_manager.cpp')
0 files changed, 0 insertions, 0 deletions