pandamicro 1071f63ac7 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3		2015-12-20 22:45:51 +08:00
..
android	Made API consistent with old version	2015-12-14 13:55:17 +08:00
ios	Adds `std::nothrow` to the `new` statements	2015-12-16 17:06:56 +08:00