merged uTP branch into trunk (yay)

2010-11-29 01:33:05 +00:00
parent 5a1669cf03
commit e5f980d80d
77 changed files with 7497 additions and 630 deletions
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -22,6 +22,7 @@

 Extensions

+* `uTP`_
 * `extensions protocol`_
 * `plugin interface`_
 * `DHT extensions`_
@@ -59,6 +60,7 @@ libtorrent
 .. _`running tests`: running_tests.html
 .. _`tuning`: tuning.html
 .. _screenshot: client_test.png
+.. _`uTP`: utp.html
 .. _`extensions protocol`: extension_protocol.html
 .. _`plugin interface`: libtorrent_plugins.html
 .. _`DHT extensions`: dht_extensions.html