axmol/plugin/protocols/proj.android/jni
zhangbin c20a067799 Merge branch 'develop' into ForUser
Conflicts:
	plugin/protocols/platform/android/PluginFactory.cpp
	plugin/protocols/proj.android/jni/Android.mk
2013-06-24 14:52:06 +08:00
..
Android.mk Merge branch 'develop' into ForUser 2013-06-24 14:52:06 +08:00
Application.mk Add plugin code into cocos2d-x engine. 2013-04-07 16:58:26 +08:00