minggo 6f624351b3 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ETC1-support		2013-05-28 11:36: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	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ETC1-support	2013-05-28 11:36:05 +08:00
cocos2dx.mk	Linux port: added libX11 to linked libraries.	2013-05-24 23:36:21 +04:00