fnz 8c691430c1 conflicts resolved		2015-11-27 13:19:10 +03:00
..
CocosPlayClient.cpp	fix android compile error	2015-05-07 10:37:19 +08:00
CocosPlayClient.h	Integrate CocosPlayClient	2015-01-13 17:30:07 +08:00
Java_org_cocos2dx_lib_Cocos2dxAccelerometer.cpp	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
Java_org_cocos2dx_lib_Cocos2dxBitmap.cpp	updates to JniHelper, refactoring of existing JNI calls	2015-11-27 12:00:33 +03:00
Java_org_cocos2dx_lib_Cocos2dxBitmap.h	coding style fix	2014-05-28 17:41:34 +08:00
Java_org_cocos2dx_lib_Cocos2dxHelper.cpp	conflicts resolved	2015-11-27 13:19:10 +03:00
Java_org_cocos2dx_lib_Cocos2dxHelper.h	conflicts resolved	2015-11-27 13:19:10 +03:00
Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp	fix textfield and editbox can not input emoticon	2015-08-05 17:03:06 +08:00
JniHelper.cpp	updates to JniHelper, refactoring of existing JNI calls	2015-11-27 12:00:33 +03:00
JniHelper.h	updates to JniHelper, refactoring of existing JNI calls	2015-11-27 12:00:33 +03:00
TouchesJni.cpp	Fixed EventListenerKeyboard.onKeyPressed not firing for back button on Android.	2015-07-02 16:19:33 +08:00