##// END OF EJS Templates
Merging latest trunk....
Merging latest trunk. I got a criss-cross merge in this and did merge --weave. Hope this is OK.

File last commit:

r1866:bca2d8bf merge
r1890:c3323314 merge
Show More
index.txt
14 lines | 237 B | text/plain | TextLexer
===========================
IPython Developer's Guide
===========================
.. toctree::
:maxdepth: 2
overview.txt
coding_guide.txt
doc_guide.txt
roadmap.txt
notification_blueprint.txt
config_blueprint.txt