Juan Linietsky fd5ee87c24 Merge branch 'master' of https://github.com/okamstudio/godot ... Conflicts: platform/windows/export/export.h		2015-11-19 10:44:13 -03:00
..
2d	-remove Vector2.atan2() replaced by Vector2.angle(), fixes #2260	2015-11-19 10:41:20 -03:00
3d	Merge pull request #2707 from akien-mga/master	2015-11-18 19:43:28 -03:00
animation	Merge pull request #2707 from akien-mga/master	2015-11-18 19:43:28 -03:00
audio	…
gui	Fix SplitContainer bool properties	2015-11-19 09:56:04 -03:00
io	…
main	Merge pull request #2707 from akien-mga/master	2015-11-18 19:43:28 -03:00
resources	Merge pull request #2707 from akien-mga/master	2015-11-18 19:43:28 -03:00
SCsub	…
register_scene_types.cpp	…
register_scene_types.h	…
scene_string_names.cpp	…
scene_string_names.h	…