zhangbin a4ed92ddaa Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop		2013-07-23 14:29:36 +08:00
..
jsbindings	Modify the min sdk version of android platform required in plugin samples.	2013-06-26 14:14:40 +08:00
plugin-x_ios.xcworkspace	Add workspace for iOS projects of plugin-x.	2013-07-05 11:42:01 +08:00
plugins	closed #2416, Add social plugin : SocialNd91 & add sample code for social plugins.	2013-07-23 14:29:11 +08:00
protocols	issue #2416, Add ProtocolSocial for iOS platform.	2013-07-23 14:26:11 +08:00
samples	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2013-07-23 14:29:36 +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