minggo cd5bcb87af issue #2284: merge master and fixed some conflicts		2013-06-13 17:54:05 +08:00
..
.cproject	issue #1770: Adding webp image format support for linux 64bit.	2013-02-06 15:47:23 +08:00
.project	issue #1770: Adding webp image format support for linux 64bit.	2013-02-06 15:47:23 +08:00
Makefile	issue #2284: merge master and fixed some conflicts	2013-06-13 17:54:05 +08:00
cocos2dx.mk	Merge pull request from cocos2d/develop	2013-06-06 09:42:18 +02:00