bmanGH 271e58d562 Merge remote-tracking branch 'upstream/develop' into develop ... Conflicts: cocos/scripting/auto-generated plugin samples/Javascript/Shared tools/bindings-generator		2014-01-14 19:00:02 +08:00
..
Cpp	Adds missing copyright headers in some files	2014-01-13 14:48:12 -08:00
Javascript	Merge remote-tracking branch 'upstream/develop' into develop	2014-01-14 19:00:02 +08:00
Lua	Fix:Replace the “setDisplayFrame” function with the “setSpriteFrame” function	2014-01-07 20:39:46 +08:00
CMakeLists.txt	issue #3113: [Linux] Adding options for modules.	2013-11-06 19:17:34 +08:00