James Chen 3bc45e665c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into constants-refactor ... Conflicts: scripting/lua/cocos2dx_support/LuaCocos2d.cpp		2013-07-26 19:56:04 +08:00
..
Classes	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into constants-refactor	2013-07-26 19:56:04 +08:00
proj.android	[Android] Usage changes: ccGLInvalidateStateCache --> GL::invalidateStateCache();	2013-07-26 14:00:10 +08:00
proj.ios	closed #2416, Add social plugin : SocialNd91 & add sample code for social plugins.	2013-07-23 14:29:11 +08:00