andyque 48f7743daa Merge branch 'v3' into cleanupBinaryLoader ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj		2014-06-10 15:08:10 +08:00
..
cpp-empty-test	Support Fast App Resume.	2014-06-04 11:19:53 +08:00
cpp-tests	Merge branch 'v3' into cleanupBinaryLoader	2014-06-10 15:08:10 +08:00
lua-empty-test	Update lua-template and lua-empty-test for replacing bgMusicPath	2014-05-28 10:27:03 +08:00
lua-tests	Fix the crash of cocostudio ui lua test cases and add some deprecated functions of Widget	2014-06-10 11:30:39 +08:00