zhangbin 849276d0f3 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop		2013-07-02 10:58:44 +08:00
..
jsbindings	Modify the min sdk version of android platform required in plugin samples.	2013-06-26 14:14:40 +08:00
plugins	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2013-07-02 10:58:44 +08:00
protocols	issue #2336, Modify the compiler of plugins project on ios.	2013-06-28 15:21:39 +08:00
samples	closed #2349, Add user login/logout plugin UC.	2013-07-02 10:51:01 +08:00
tools	closed #2349, Add user login/logout plugin UC.	2013-07-02 10:51:01 +08:00
.gitignore	Add advertisement type for more Ads plugins.	2013-06-18 15:53:56 +08:00