minggo cd5bcb87af issue #2284: merge master and fixed some conflicts		2013-06-13 17:54:05 +08:00
..
Makefile	issue #2284: merge master and fixed some conflicts	2013-06-13 17:54:05 +08:00
cocos2dx.mk	issue #2242:use -std=gnu++0x for linux and native client project	2013-06-03 13:50:19 +08:00