##// 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 / kernel / tests
__init__.py Loading ...
controllertest.py Loading ...
engineservicetest.py Loading ...
multienginetest.py Loading ...
tasktest.py Loading ...
test_contexts.py Loading ...
test_controllerservice.py Loading ...
test_enginefc.py Loading ...
test_engineservice.py Loading ...
test_multiengine.py Loading ...
test_multienginefc.py Loading ...
test_newserialized.py Loading ...
test_pendingdeferred.py Loading ...
test_task.py Loading ...
test_taskfc.py Loading ...