6 Commits

Author	SHA1	Message	Date
boyu0	d12ee5f120	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical	2013-10-18 15:34:13 +08:00
minggo	95acb1b9e3	issue #2905: helloworld build ok on android	2013-10-14 14:01:00 +08:00
minggo	19ee87e29a	issue #2905: step2 Box2D -> box2d	2013-10-12 14:03:04 +08:00
minggo	1f38636e84	issue #2905: step1 Box2D -> box2d	2013-10-12 14:02:13 +08:00
minggo	ad6325b0dd	fix conflicts	2013-10-12 11:31:32 +08:00
minggo	4313c46e93	issue #2905:adjust folder structure	2013-10-12 11:22:05 +08:00