mirror of https://github.com/axmolengine/axmol.git
912905054e
Merge branch 'curl_raii' of https://github.com/sergey-shambir/cocos2d-x into sergey-shambir-curl_raii Conflicts: extensions/network/HttpClient.cpp samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp |
||
---|---|---|
.. | ||
CocosBuilderTest | ||
ControlExtensionTest | ||
EditBoxTest | ||
NetworkTest | ||
NotificationCenterTest | ||
TableViewTest | ||
ExtensionsTest.cpp | ||
ExtensionsTest.h |