James Chen 653c1f7f8f Merge branch 'releasing' of https://github.com/minggo/cocos2d-x into minggo-releasing		2013-07-25 16:00:45 +08:00
..
Cpp	issue #2404: Invocation of some deprecated methods fixes.	2013-07-25 15:25:11 +08:00
Javascript	Merge branch 'releasing' of https://github.com/minggo/cocos2d-x into minggo-releasing	2013-07-25 16:00:45 +08:00
Lua	Merge pull request #3232 from samuele3hu/TestSample	2013-07-23 23:33:28 -07:00
samples.xcodeproj	issue #2426:Add Drawprimitives.lua and Drawprimitives lua test sample	2013-07-24 10:15:16 +08:00