##// END OF EJS Templates
Merge commit '37dadeb' (most of PR #4391)...
Merge commit '37dadeb' (most of PR #4391) Conflicts: IPython/testing/iptestcontroller.py
Thomas Kluyver -
r13312:c1912cf4 merge
Show More
Name Size Modified Last Commit Author
/ IPython / kernel
blocking
inprocess
ioloop
tests
zmq
__init__.py Loading ...
channels.py Loading ...
channelsabc.py Loading ...
client.py Loading ...
clientabc.py Loading ...
connect.py Loading ...
launcher.py Loading ...
manager.py Loading ...
managerabc.py Loading ...
multikernelmanager.py Loading ...
restarter.py Loading ...