merged changes from RC_1_0

This commit is contained in:
Arvid Norberg
2014-09-01 08:59:12 +00:00
parent 57b00ae42e
commit 19f3de10dd
3 changed files with 2 additions and 14 deletions

View File

@@ -40,6 +40,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include "libtorrent/thread.hpp"
#include "libtorrent/alert_types.hpp"
#include "test.hpp"
#include "setup_transfer.hpp"
#include <boost/tuple/tuple.hpp>