12 Commits

Author	SHA1	Message	Date
minggo	9ab2dae212	Merge pull request #6635 from dumganhar/iss4660-unicode ... issue #4660: ccUTF8 uses utf8-utf16 conversion in llvm3.4	2014-05-12 17:57:25 +08:00
James Chen	5b14338d1f	Update Android.mk	2014-05-11 13:22:42 +08:00
James Chen	292c1a5aa4	Linux android build fix	2014-05-11 12:50:51 +08:00
James Chen	dd3ed008b9	issue #4660: Updates Android.mk	2014-05-10 19:24:04 +08:00
James Chen	ed8633141f	issue #4660: Updates android.mk	2014-05-10 19:24:03 +08:00
yangxiao	d46729862c	android rename ShaderCahe to GLProgramCache	2014-05-09 19:05:39 -07:00
yangxiao	877d8dd771	android works!!	2014-05-09 15:59:49 -07:00
yangxiao	879958855b	UniformValue use union array	2014-05-09 14:38:36 -07:00
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