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

r1113:4f9f7767
r2757:c7455244 merge
Show More
.checkeol
2 lines | 10 B | text/plain | TextLexer
[LF]
*.py