##// END OF EJS Templates
Merge branch 'newkernel' of git://github.com/ellisonbg/ipython into qtfrontend...
Merge branch 'newkernel' of git://github.com/ellisonbg/ipython into qtfrontend Conflicts: IPython/frontend/qt/console/frontend_widget.py IPython/frontend/qt/console/ipython_widget.py IPython/zmq/ipkernel.py
epatters -
r2795:e518f8e9 merge
Show More
Name Size Modified Last Commit Author
/ IPython / core
tests
__init__.py Loading ...
alias.py Loading ...
application.py Loading ...
autocall.py Loading ...
builtin_trap.py Loading ...
completer.py Loading ...
crashhandler.py Loading ...
debugger.py Loading ...
display_trap.py Loading ...
displayhook.py Loading ...
error.py Loading ...
excolors.py Loading ...
extensions.py Loading ...
fakemodule.py Loading ...
history.py Loading ...
hooks.py Loading ...
inputlist.py Loading ...
inputsplitter.py Loading ...
interactiveshell.py Loading ...
ipapi.py Loading ...
logger.py Loading ...
macro.py Loading ...
magic.py Loading ...
oinspect.py Loading ...
page.py Loading ...
plugin.py Loading ...
prefilter.py Loading ...
prompts.py Loading ...
quitter.py Loading ...
release.py Loading ...
shadowns.py Loading ...
splitinput.py Loading ...
ultratb.py Loading ...
usage.py Loading ...