##// END OF EJS Templates
Merge branch 'kernelmanager' of git://github.com/ellisonbg/ipython into qtfrontend. Fixed breakage and conflicts from merge....
Merge branch 'kernelmanager' of git://github.com/ellisonbg/ipython into qtfrontend. Fixed breakage and conflicts from merge. Conflicts: IPython/frontend/qt/console/ipython_widget.py
epatters -
r2701:c46f948d merge
Show More
Name Size Modified Last Commit Author
/ IPython / zmq
__init__.py Loading ...
blockingkernelmanager.py Loading ...
completer.py Loading ...
frontend.py Loading ...
kernel.py Loading ...
kernelmanager.py Loading ...
ktest.py Loading ...
session.py Loading ...