merged changes from RC_1_0

2014-08-16 07:46:06 +00:00
parent 8833f27a46
commit 3f88389f05
12 changed files with 88 additions and 51 deletions
--- a/examples/client_test.cpp
+++ b/examples/client_test.cpp
@@ -31,6 +31,8 @@ POSSIBILITY OF SUCH DAMAGE.
 */

 #include <iterator>
+#include <stdio.h> // for snprintf
+#include <stdlib.h> // for atoi

 #include "libtorrent/config.hpp"