Juan Linietsky 954256268a Merge branch 'master' of https://github.com/okamstudio/godot ... Conflicts: demos/2d/motion/engine.cfg		2015-06-06 11:09:00 -03:00
..
2d	-fixes to navigation, so edge-merging is more flexible on conflict	2015-06-01 19:42:34 -03:00
3d	-fixes to navigation, so edge-merging is more flexible on conflict	2015-06-01 19:42:34 -03:00
animation	Merge branch 'master' of https://github.com/okamstudio/godot	2015-06-06 11:09:00 -03:00
audio	Updated copyright year in all headers	2015-04-18 14:38:54 -03:00
gui	-fixes to navigation, so edge-merging is more flexible on conflict	2015-06-01 19:42:34 -03:00
io	ability to run 2D physics in a thread	2015-05-26 01:06:05 -03:00
main	small description improvement	2015-05-17 17:19:12 -03:00
resources	-fixes to navigation, so edge-merging is more flexible on conflict	2015-06-01 19:42:34 -03:00
register_scene_types.cpp	Updated copyright year in all headers	2015-04-18 14:38:54 -03:00
register_scene_types.h	Updated copyright year in all headers	2015-04-18 14:38:54 -03:00
scene_string_names.cpp	Updated copyright year in all headers	2015-04-18 14:38:54 -03:00
scene_string_names.h	Updated copyright year in all headers	2015-04-18 14:38:54 -03:00
SCsub	Build System Changes	2014-10-07 01:31:49 -03:00