andyque 48f7743daa Merge branch 'v3' into cleanupBinaryLoader ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj		2014-06-10 15:08:10 +08:00
..
UITextTest.cpp	add text effect test	2014-06-09 14:34:46 +08:00
UITextTest.h	add text effect test	2014-06-09 14:34:46 +08:00
UITextTest_Editor.cpp	add binary file parsing into ui tests	2014-06-05 10:25:45 +08:00
UITextTest_Editor.h	issue #5056. move gui test from ExtensionsTest to the outside	2014-05-08 14:35:45 +08:00