##// 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 / attic
COPYING Loading ...
ChangeLog Loading ...
ipnb_google_soc.lyx Loading ...
nbexample.py Loading ...
nbexample_latex.py Loading ...
nbexample_output.py Loading ...
new_design.lyx Loading ...