##// 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 / 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 ...