10 Commits

Author	SHA1	Message	Date
walzer	ad5ee3c9f6	Merge remote branch 'remotes/origin/upto-0.99.5' Fix some conflicts manually.	2011-01-17 16:21:11 +08:00
natural-law	ec7fbd0e69	Fix bugs. ... 1. Run tests and HelloWorld in cocos2d-android. 2. Modify the makefile of cocos2d-uphone.	2011-01-07 11:30:19 +08:00
Li Lirong	e58ba468ee	fix some warnings under android	2010-12-29 10:30:42 +08:00
minggo	6b37bc97d4	fixed #220: run tests on android	2010-12-09 10:50:02 +08:00
minggo	534a55eaa1	issue #220: All tests run on android emulator, but the effect of some tests are wrong	2010-12-06 09:51:21 +08:00
Walzer	820c2f0714	issue #211 cocos2d-x back to cocos2dx	2010-11-18 15:01:42 +00:00
Walzer	b4328354af	issue #211 cocos2dx -> cocos2d-x	2010-11-18 14:07:17 +00:00
natural-law	a0930a2991	debug	2010-11-13 09:01:35 +00:00
Ming	0ea2035ec6		2010-11-04 09:33:31 +00:00
Ming	b60fbd82a5	added for android	2010-11-03 03:01:17 +00:00