merged changes from RC_1_0

2014-10-22 07:05:10 +00:00
parent 8d99b6eabb
commit 907dc9dddd
14 changed files with 85 additions and 39 deletions
--- a/docs/gen_reference_doc.py
+++ b/docs/gen_reference_doc.py
@@ -924,7 +924,7 @@ for cat in categories:

 	out.write('''
 :Author: Arvid Norberg, arvid@libtorrent.org
-:Version: 1.0.0
+:Version: 1.1.0

 .. contents:: Table of contents
  :depth: 1