samuele3hu 783be69322 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into toluaerror ... Conflicts: tools/tolua/cocos2dx.ini		2013-12-23 17:20:17 +08:00
..
Box2D	reset cmakelists.txt	2013-11-28 15:41:23 +08:00
chipmunk	remove makefiles	2013-11-11 17:29:48 +08:00
curl	closed #2539:use unstripped libcurl lib for armeabi-v7 architecture to fix link warnings	2013-11-27 10:34:05 +08:00
edtaa3func	new label:add support for distanceField	2013-12-13 12:42:15 +08:00
freetype2	issue #2905: helloworld build ok on android	2013-10-14 14:01:00 +08:00
glfw3	issue #2905:adjust folder structure	2013-10-12 11:22:05 +08:00
jpeg	issue #2905: helloworld build ok on android	2013-10-14 14:01:00 +08:00
json	use ssize_t for index and capacity	2013-12-12 14:48:26 +08:00
linux-specific/fmod	Move the library of fmod to external folder.	2013-11-04 21:03:08 +08:00
lua	issue #3353:Lua gc mechanism will make the extended attributes of lua userdata disapper	2013-12-06 14:16:33 +08:00
png	fix xcode compiling error and simplify android.mk	2013-10-18 15:39:09 +08:00
spidermonkey	issue #2826: Bug fix of 'js::IsInRequest'	2013-11-01 10:44:15 +08:00
sqlite3	issue #1620: Added sqlite3 library for win32.	2013-01-06 11:56:39 +08:00
tiff	fix xcode compiling error and simplify android.mk	2013-10-18 15:39:09 +08:00
tinyxml2	[cmake] output lib to root/lib	2013-11-04 21:03:08 +08:00
unzip	fix some warnings	2013-11-16 20:02:49 +08:00
webp	fix xcode compiling error and simplify android.mk	2013-10-18 15:39:09 +08:00
websockets	issue #2905:TestJavascript build ok on Android	2013-10-17 11:28:57 +08:00
win32-specific	issue #2905:adjust folder structure	2013-10-12 11:22:05 +08:00