5 Commits

Author	SHA1	Message	Date
chengstory	faaf6d3f2b	fixed #3457 fixes some bug.	2013-12-27 17:21:13 +08:00
chengstory	8ae7ecff33	Merge branch 'develop' into #3457 ... Conflicts: build/cocos2d_samples.xcodeproj/project.pbxproj cocos/editor-support/cocostudio/CCSGUIReader.cpp cocos/editor-support/cocostudio/CCSGUIReader.h	2013-12-26 12:55:52 +08:00
chengstory	8afdf88d25	Test triiger 3.0	2013-12-26 01:17:04 +08:00
yinkaile	5eb961b165	fixed warning	2013-12-25 19:46:09 +08:00
yinkaile	d72c9d94d7	upload trigger code.	2013-12-25 17:40:54 +08:00