5 Commits

Author	SHA1	Message	Date
pandamicro	9972bfb98c	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into audioengine ... # Conflicts: # tests/js-tests/src/NativeTest/NativeTest.js	2015-07-29 21:01:56 +08:00
pandamicro	347854e8d3	Add Audio Control test case	2015-07-29 20:48:11 +08:00
pandamicro	6c16a4b990	Add test cases for extended classes in JSB	2015-07-28 18:25:11 +08:00
jianglong0156	7f0167785d	add back label	2015-07-17 13:46:00 +08:00
jianglong0156	c844a77786	add fileUtils writeString,writeValueMap,writeValueVector	2015-07-17 12:04:47 +08:00