Huabing.Xu 041bef148a Merge branch 'origin/develop' ... Conflicts: cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj cocos2dx/proj.win32/cocos2d.vcxproj.filters		2013-07-02 13:47:02 +08:00
..
.cproject	removed libxml2 dependence from libcocos2d	2013-06-27 08:30:55 +02:00
.project	Added ccFPSImages entity as linked resource	2013-06-30 22:00:29 +02:00
Makefile	1. Add C++ code to decode ETC file	2013-07-01 17:40:57 +08:00
cocos2dx.mk	issue #2325: [Linux] KEYBOARD_SUPPORT --> CC_KEYBOARD_SUPPORT.	2013-06-29 11:44:14 +08:00
cocos2dx.prf	Enabled c++0x flag, use OpenAL audio backend by default.	2013-06-04 14:29:29 +04:00
cocos2dx.pri	Enabled c++0x flag, use OpenAL audio backend by default.	2013-06-04 14:29:29 +04:00