honghui 59c8c3abf2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3		2014-09-11 17:19:31 +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	Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3	2014-09-11 17:07:55 +08:00
cocos2dx_files.json	Merge pull request #7950 from super626/billboard	2014-09-11 16:29:05 +08:00