Ricardo Quesada d7590affda Merge branch 'develop' into dictionary_array_fixes ... Conflicts: cocos2dx/cocoa/CCArray.cpp cocos2dx/cocoa/CCArray.h cocos2dx/label_nodes/CCLabel.cpp extensions/CCArmature/datas/CCDatas.cpp extensions/CCArmature/display/CCDisplayManager.cpp		2013-08-21 21:27:44 -07:00
..
HttpClient.cpp	fix warnings caused by deprecating some functions of Array	2013-08-22 10:45:47 +08:00
HttpClient.h	Yet another documentation fix.	2013-08-01 21:40:13 +08:00
HttpRequest.h	fixed warnings on Android and windows	2013-07-28 21:43:20 +08:00
HttpResponse.h	CCAssert -> CCASSERT	2013-07-19 22:01:27 -07:00
SocketIO.cpp	Array & Dictionary fixes	2013-08-21 20:12:09 -07:00
SocketIO.h	[Tizen] Fix compile error.	2013-07-19 15:16:05 +09:00
WebSocket.cpp	fix for undefined protocol	2013-08-02 10:35:45 +09:00
WebSocket.h	fixed warnings on Android and windows	2013-07-28 21:43:20 +08:00