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

r2801:aa6723b8
r2873:087388fb merge
Show More
__init__.py
0 lines | 0 B | text/x-python | PythonLexer