##// END OF EJS Templates
Merge branch 'kernelmanager' of git://github.com/ellisonbg/ipython into qtfrontend...
Merge branch 'kernelmanager' of git://github.com/ellisonbg/ipython into qtfrontend Conflicts: IPython/frontend/qt/util.py

File last commit:

r1877:d11df54f
r2757:c7455244 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