Huabing.Xu f65973d9f0 Merge branch 'develop' into develop_migrate_math_lib_merge ... Conflicts: cocos/2d/CCActionInterval.cpp cocos/2d/CCLabelAtlas.cpp cocos/2d/CCLabelBMFont.cpp tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp		2014-04-23 14:46:14 +08:00
..
AppDelegate.cpp	Update AppDelegate.cpp	2014-04-22 13:20:07 +08:00
AppDelegate.h	Removes unused templates.	2014-03-04 09:46:32 +08:00
HelloWorldScene.cpp	replace Point with Vector2 in tests, extension folder	2014-04-15 18:23:40 +08:00
HelloWorldScene.h	Removes unused templates.	2014-03-04 09:46:32 +08:00