WuHao 27d0f51e9b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj build/cocos2d_tests.xcodeproj/project.pbxproj cocos/2d/libcocos2d.vcxproj.filters tools/cocos2d-console web		2015-06-15 16:13:36 +08:00
..
ControllerManualAdapter	Fixed bugs[Ouya controller]:	2014-07-17 11:09:08 +08:00
java	Merge pull request #15 from pandamicro/spritepolygon	2015-06-15 15:47:02 +08:00
jni	fix android compile error	2015-05-07 10:37:19 +08:00
libcocos2dx	[ci skip]Android Studio projects:Fixed compile error.	2015-06-15 14:42:45 +08:00
libcocos2dx-with-controller	[ci skip]Android Studio projects:Fixed compile error.	2015-06-15 14:42:45 +08:00
Android.mk	Add enhance service API	2015-05-15 14:29:22 +08:00
CCApplication-android.cpp	Added Bulgarian language.	2015-03-17 15:14:02 +02:00
CCApplication-android.h	openUrl function for all platform but on windows RT empty function	2014-09-22 17:47:38 +04:00
CCCommon-android.cpp	compiles and runs on linux	2014-09-09 17:41:49 -07:00
CCDevice-android.cpp	Fixed JNI illegal start byte error	2015-04-15 18:20:52 +08:00
CCEnhanceAPI-android.cpp	modify Enhance API	2015-05-28 10:47:12 +08:00
CCEnhanceAPI-android.h	Add enhance service API	2015-05-15 14:29:22 +08:00
CCFileUtils-android.cpp	Remove FileUtilsAndroid::purgeCachedEntries	2015-01-14 16:05:33 +08:00
CCFileUtils-android.h	Remove FileUtilsAndroid::purgeCachedEntries	2015-01-14 16:05:33 +08:00
CCGL-android.h	Compiles on Android	2014-09-09 17:53:08 -07:00
CCGLViewImpl-android.cpp	compiles and runs on linux	2014-09-09 17:41:49 -07:00
CCGLViewImpl-android.h	Compiles on Android	2014-09-09 17:53:08 -07:00
CCPlatformDefine-android.h	Compiles on Android	2014-09-09 17:53:08 -07:00
CCStdC-android.h	Compiles on Android	2014-09-09 17:53:08 -07:00
javaactivity-android.cpp	Need JNIEXPORT for -fvisibility=hidden	2015-05-06 14:24:48 +09:00