##// 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 / sphinxext
apigen.py Loading ...
docscrape.py Loading ...
docscrape_sphinx.py Loading ...
inheritance_diagram.py Loading ...
ipython_console_highlighting.py Loading ...
ipython_directive.py Loading ...
numpydoc.py Loading ...