##// 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

File last commit:

r2592:01435682
r2873:087388fb merge
Show More
.gitignore
6 lines | 72 B | text/plain | TextLexer
docs/dist
docs/build/*
docs/source/api/generated
*.pyc
build
*.egg-info