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
..
jsbindings	Update the JS binding for the change of class ProtocolAds.	2013-07-26 16:07:30 +08:00
plugin-x_ios.xcworkspace	Add workspace for iOS projects of plugin-x.	2013-07-05 11:42:01 +08:00
plugins	Update class ProtocolAds to compatible with more Ads SDKs.	2013-07-26 15:51:06 +08:00
protocols	Update the JS binding for the change of class ProtocolAds.	2013-07-26 16:07:30 +08:00
samples	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into constants-refactor	2013-07-26 19:56:04 +08:00
tools	issue #2390, Resolve the bug in file plugin/tools/toolsForGame/modifyClassPath.py.	2013-07-10 16:21:16 +08:00
.gitignore	Add advertisement type for more Ads plugins.	2013-06-18 15:53:56 +08:00