##// 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.
Brian Granger -
r1890:c3323314 merge
Show More
Name Size Modified Last Commit Author
/ docs / sphinxext
apigen.py Loading ...
docscrape.py Loading ...
docscrape_sphinx.py Loading ...
inheritance_diagram.py Loading ...
ipython_console_highlighting.py Loading ...
numpydoc.py Loading ...
only_directives.py Loading ...
plot_directive.py Loading ...