zhangbin e994321a61 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop ... Conflicts: plugin/samples/HelloSocial/proj.ios/HelloSocial.xcodeproj/project.pbxproj		2013-06-09 17:30:37 +08:00
..
HelloAds	Add support for C++ 11in samples	2013-06-04 11:49:46 +08:00
HelloAnalytics	Update the license in the sample code.	2013-06-05 11:19:54 +08:00
HelloAnalytics-JS	Add support for C++ 11in samples	2013-06-04 11:49:46 +08:00
HelloIAP	Add support for C++ 11in samples	2013-06-04 11:49:46 +08:00
HelloIAP-JS	Add support for C++ 11in samples	2013-06-04 11:49:46 +08:00
HelloSocial	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2013-06-09 17:30:37 +08:00