##// 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
/ IPython / testing
attic
plugin
tests
__init__.py Loading ...
decorator_msim.py Loading ...
decorators.py Loading ...
decorators_numpy.py Loading ...
iptest.py Loading ...
mkdoctests.py Loading ...
parametric.py Loading ...
tutils.py Loading ...
util.py Loading ...