104 Commits

Author	SHA1	Message	Date
andyque	657720e509	Merge remote-tracking branch 'upstream/v3' into focus3861	2014-05-07 11:42:09 +08:00
zhangbin	9966d83c02	Export the `2d` include directory of engine on android.	2014-05-07 10:43:42 +08:00
andyque	33f7a500f3	issue #4861. add android keypad support	2014-05-05 11:37:38 +08:00
Ricardo Quesada	32f3fedb37	Moves cocos/2d/Android.mk to cocos/Android.mk ... Easier to find Android.mk	2014-05-01 14:09:26 -07:00