James Chen 99c20c4e30 Merge commit 'refs/pull/5268/head' of git://github.com/cocos2d/cocos2d-x into merge5268 ... Conflicts: tests/test-javascript/tests		2014-02-10 11:38:56 +08:00
..
PhysicsTest.lua	Merge commit 'refs/pull/5268/head' of git://github.com/cocos2d/cocos2d-x into merge5268	2014-02-10 11:38:56 +08:00