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

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