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

r1877:d11df54f
r2873:087388fb merge
Show More
.bzrignore
4 lines | 110 B | text/plain | TextLexer
# IPython-specific files and pattersn that bzr should ignore
docs/dist
docs/build/*
docs/source/api/generated