##// 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 / kernel / core
tests
__init__.py Loading ...
display_formatter.py Loading ...
display_trap.py Loading ...
error.py Loading ...
fd_redirector.py Loading ...
file_like.py Loading ...
history.py Loading ...
interpreter.py Loading ...
macro.py Loading ...
magic.py Loading ...
message_cache.py Loading ...
output_trap.py Loading ...
prompts.py Loading ...
redirector_output_trap.py Loading ...
sync_traceback_trap.py Loading ...
traceback_formatter.py Loading ...
traceback_trap.py Loading ...
util.py Loading ...