##// END OF EJS Templates
Merge branch 'newkernel' into upstream-newkernel...
Merge branch 'newkernel' into upstream-newkernel Conflicts: IPython/frontend/qt/console/scripts/ipythonqt.py IPython/zmq/ipkernel.py
Brian Granger -
r2873:087388fb merge
Show More
Name Size Modified Last Commit Author
/ IPython / lib
tests
__init__.py Loading ...
backgroundjobs.py Loading ...
clipboard.py Loading ...
deepreload.py Loading ...
demo.py Loading ...
inputhook.py Loading ...
inputhookgtk.py Loading ...
inputhookwx.py Loading ...
irunner.py Loading ...
pylabtools.py Loading ...