Juan Linietsky 082e3fbb29 Merge branch 'master' of https://github.com/okamstudio/godot ... Conflicts: main/main.cpp		2015-11-24 10:52:41 -03:00
..
input_default.cpp	Added ability to set custom mouse cursors. Not hardware accelerated yet.	2015-09-24 18:06:15 -03:00
input_default.h	Added ability to set custom mouse cursors. Not hardware accelerated yet.	2015-09-24 18:06:15 -03:00
main.cpp	Merge branch 'master' of https://github.com/okamstudio/godot	2015-11-24 10:52:41 -03:00
main.h	Updated copyright year in all headers	2015-04-18 14:38:54 -03:00
performance.cpp	Updated copyright year in all headers	2015-04-18 14:38:54 -03:00
performance.h	Updated copyright year in all headers	2015-04-18 14:38:54 -03:00
SCsub	Cosmetic fixes to SCons buildsystem	2015-11-01 20:53:26 +01:00
splash.h	Add icon to exe file in windows export	2015-11-09 02:23:58 +03:30