5 Commits

Author	SHA1	Message	Date
Huabing.Xu	1670e07300	Merge branch 'develop' into develop_migrate_math_lib_merge ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj build/cocos2d_tests.xcodeproj/project.pbxproj	2014-04-11 11:18:13 +08:00
James Chen	5615717617	issue #4729: NULL -> nullptr in constructor or setXXX(NULL)	2014-04-10 00:36:43 +08:00
James Chen	9d8d256bee	issue #4729: Android build works ok.	2014-04-10 00:36:42 +08:00
James Chen	a240c7b240	issue #4729: Moved CCNotificationCenter.h/.cpp to deprecated folder.	2014-04-10 00:36:42 +08:00
James Chen	5b296a62e9	issue #4729: Moved deprecated classes to 'cocos/deprecated' folder	2014-04-10 00:36:41 +08:00