From 55661514e9cdaeeb7bf90fceeebf6fa6e1d2958c Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Thu, 10 Jul 2014 16:23:47 +0000 Subject: [PATCH] merged changes from RC_1_0 --- AUTHORS | 2 +- docs/makefile | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 6c82ec790..b26128709 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,7 +1,7 @@ Written by Arvid Norberg. Copyright (c) 2003-2014 Contributions by: -Ajax16384 +Andrei Kurushin Steven Siloti Thomas Fischer Massaroddel diff --git a/docs/makefile b/docs/makefile index f1bc86bc7..c9da992f8 100644 --- a/docs/makefile +++ b/docs/makefile @@ -63,12 +63,15 @@ manual.rst: stats_counters.rst troubleshooting_thumb.png: troubleshooting.png convert troubleshooting.png -resize 800x800 troubleshooting_thumb.png + cp $@ $(WEB_PATH)/$@ troubleshooting.png: troubleshooting.dot dot troubleshooting.dot -Tpng >troubleshooting.png + cp $@ $(WEB_PATH)/$@ todo.html:gen_todo.py ../src/*.cpp ../include/libtorrent/*.hpp python gen_todo.py + cp $@ $(WEB_PATH)/$@ $(REFERENCE_TARGETS:=.rst):gen_reference_doc.py ../include/libtorrent/*.hpp ../include/libtorrent/kademlia/*.hpp manual.rst settings.rst session_stats.rst python gen_reference_doc.py