aboutsummaryrefslogtreecommitdiffstats
path: root/docs/index.txt
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-06-09 10:14:32 -0400
committerJason R. Coombs <jaraco@jaraco.com>2013-06-09 10:14:32 -0400
commitacce77b1dfb768dd7fdec3b76dc5c64d27320f82 (patch)
tree7974fddd9edd07e2bcf7004cc48d668d4d9a6083 /docs/index.txt
parent87db22d06a93278635e4fc551872be3b40c5a249 (diff)
downloadexternal_python_setuptools-acce77b1dfb768dd7fdec3b76dc5c64d27320f82.tar.gz
external_python_setuptools-acce77b1dfb768dd7fdec3b76dc5c64d27320f82.tar.bz2
external_python_setuptools-acce77b1dfb768dd7fdec3b76dc5c64d27320f82.zip
Moved MERGE.txt into the setuptools documentation.
--HG-- rename : MERGE.txt => docs/merge.txt
Diffstat (limited to 'docs/index.txt')
-rw-r--r--docs/index.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/index.txt b/docs/index.txt
index 21442b93..162a5f6f 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -16,6 +16,7 @@ Documentation content:
.. toctree::
:maxdepth: 2
+ merge
roadmap
python3
using