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
..
cpp-empty-test	upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found).	2014-05-07 17:41:04 +03:00
cpp-tests	Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram	2014-05-08 10:16:09 -07:00
lua-empty-test	Adds vcxproj.user, win32 app run by VS2012 needs the 'Debug Path' which	2014-05-08 21:19:54 +08:00
lua-tests	Adds vcxproj.user, win32 app run by VS2012 needs the 'Debug Path' which	2014-05-08 21:19:54 +08:00