yangws 7e81c56231 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 439 ... Conflicts: cocos2dx/platform/ios/CCFileUtils_ios.mm		2011-03-30 11:05:23 +08:00
..
CCAccelerometer_android.cpp	issue #375: android compiled ok	2011-03-08 13:49:58 +08:00
CCAccelerometer_android.h	issue #375: android compiled ok	2011-03-08 13:49:58 +08:00
CCApplication_android.cpp	issue #375: android compiled ok	2011-03-08 13:49:58 +08:00
CCApplication_android.h	issue #375: android compiled ok	2011-03-08 13:49:58 +08:00
CCEGLView_android.cpp	issue #375: android compiled ok	2011-03-08 13:49:58 +08:00
CCEGLView_android.h	issue #375: android compiled ok	2011-03-08 13:49:58 +08:00
CCFileUtils_android.cpp	issue #439 wophone and android modified.	2011-03-29 15:05:53 +08:00
CCImage_android.cpp	issue #439 wophone and android modified.	2011-03-29 15:05:53 +08:00
CCThread_android.cpp	issue #396 android modified.	2011-03-28 11:09:49 +08:00
Cocos2dJni.cpp	[android] fixed #422: multitouch for android	2011-03-29 14:20:05 +08:00
Cocos2dJni.h	Added logic to disable sensors from the c++ code	2011-02-05 20:17:24 -03:00