##// END OF EJS Templates
Merging from upstream (with a few local cleanups when resolving conflicts).
Merging from upstream (with a few local cleanups when resolving conflicts).
Fernando Perez -
r1866:bca2d8bf 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 ...