dumganhar 07da67f253 Merge branch 'master' into master_base ... Conflicts: cocos2dx/menu_nodes/CCMenu.cpp		2011-11-24 11:52:16 +08:00
..
airplay	fixed #582, use libpng instead of CIwImage in CCImage_airplay.cpp. Thanks to Max Akensov's contribution.	2011-07-07 14:45:59 +08:00
android	issue #838: HelloWorld support x86	2011-11-23 11:02:18 +08:00
bada	add bada1.0 pthread support	2011-11-24 00:07:50 +08:00
ios	libcurl works ok on ios	2011-04-18 14:12:41 +08:00
linux	bundle 64 bit linux static libs	2011-10-28 12:19:26 +08:00
win32	issue #854: add pthread for win32 and implement CCTextureCache::addImageAsync()	2011-11-16 11:04:29 +08:00