##// 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
Brian Granger -
r2873:087388fb merge
Show More
Name Size Modified Last Commit Author
/ IPython / frontend / qt / console
scripts
tests
__init__.py Loading ...
ansi_code_processor.py Loading ...
call_tip_widget.py Loading ...
completion_lexer.py Loading ...
completion_widget.py Loading ...
console_widget.py Loading ...
frontend_widget.py Loading ...
ipython_widget.py Loading ...
pygments_highlighter.py Loading ...
rich_ipython_widget.py Loading ...