##// 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
/ docs / man
ipcluster.1 Loading ...
ipcontroller.1 Loading ...
ipengine.1 Loading ...
ipython-wx.1 Loading ...
ipython.1 Loading ...
ipythonx.1 Loading ...
irunner.1 Loading ...
pycolor.1 Loading ...