##// 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 / tests
__init__.py Loading ...
obj_del.py Loading ...
tclass.py Loading ...
test_genutils.py Loading ...
test_iplib.py Loading ...
test_magic.py Loading ...