carlo morgantini b2579987e5 Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge ... Conflicts: cocos2d_libs.xcodeproj/project.pbxproj cocos2dx/include/ccTypes.h samples/samples.xcodeproj/project.pbxproj		2013-07-31 13:58:25 -07:00
..
HttpClientTest.cpp	fixes warnigns when using HttpRequest	2013-07-26 14:34:17 -07:00
HttpClientTest.h	issue #2129: Removing CC prefix for samples module.	2013-06-20 14:17:10 +08:00
SocketIOTest.cpp	New Label stuff merged and Label::Alignment replaced with TextVAlignment and TextHAlignment	2013-07-26 16:04:21 -07:00
SocketIOTest.h	Implements a socket.io client extension, adds a test case and updates the android makefiles.	2013-07-11 17:41:42 -04:00
WebSocketTest.cpp	New Label stuff merged and Label::Alignment replaced with TextVAlignment and TextHAlignment	2013-07-26 16:04:21 -07:00
WebSocketTest.h	TestCpp for iOS uses libcocos2dx, libCocosDenshion, etc...	2013-06-24 16:59:00 -07:00