yangxiao 5274b4f958 merge cocos resolve conflict		2014-09-11 16:02:07 +08:00
..
cpp-template-default	fix wp8 compile error and modify default resource path	2014-09-05 11:21:08 +08:00
lua-template-default	Solve the problem: gdbserver is not copied to directory proj.android/libs when ndk-build with NDK_DEBUG=1.	2014-08-28 16:13:11 +08:00
lua-template-runtime	Fix the crash of project which was created by the lua-template-runtime	2014-09-03 14:54:58 +08:00
cocos2dx_files.json	merge cocos resolve conflict	2014-09-11 16:02:07 +08:00