James Chen 510b29a2ff Merge branch 'android-textures-fix' of https://github.com/jotel/cocos2d-x into shared-codes ... Conflicts: cocos2dx/textures/CCTextureCache.cpp		2013-07-16 16:33:02 +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 #2390, Resolve the bug in modify game projects tools.	2013-07-10 10:40:42 +08:00
protocols	closed #2330, Support more ABI types in plugin.	2013-07-05 17:26:07 +08:00
samples	Merge branch 'android-textures-fix' of https://github.com/jotel/cocos2d-x into shared-codes	2013-07-16 16:33:02 +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