James Chen b0af2667f8 Merge commit 'refs/pull/4433/head' of git://github.com/cocos2d/cocos2d-x into ccconsole ... Conflicts: cocos/scripting/auto-generated		2013-12-05 12:48:32 +08:00
..
SpriteTest.cpp.REMOVED.git-id	Merge commit 'refs/pull/4433/head' of git://github.com/cocos2d/cocos2d-x into ccconsole	2013-12-05 12:48:32 +08:00
SpriteTest.h	More bug fixes	2013-12-04 16:26:21 -08:00