Ricardo Quesada 087378926f Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj		2014-05-08 10:16:09 -07:00
..
Classes	Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram	2014-05-08 10:16:09 -07:00
Resources	Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram	2014-05-08 10:16:09 -07:00
proj.android	issue #4674: Re-added deleted source files.	2014-05-04 14:37:55 +08:00
proj.ios	issue #4674: Re-added deleted source files.	2014-05-04 14:37:55 +08:00
proj.linux	Renames 'samples' folder to 'tests', ouch....	2014-03-11 19:10:34 +08:00
proj.mac	issue #4674: Re-added deleted source files.	2014-05-04 14:37:55 +08:00
proj.win32	Adds vcxproj.user, win32 app run by VS2012 needs the 'Debug Path' which	2014-05-08 21:19:54 +08:00
proj.wp8-xaml	added missing Assets folder	2014-05-05 13:47:43 -07:00
.cocos-project.json	issue #4674: Re-added deleted source files.	2014-05-04 14:37:55 +08:00
Android.mk	issue #4876:Add test case to play video	2014-05-08 18:14:32 +08:00
CMakeLists.txt	issue #5056. fix linux & android compile error	2014-05-08 15:20:24 +08:00