##// END OF EJS Templates
Merge branch 'master' into htmlnotebook...
Merge branch 'master' into htmlnotebook Conflicts: setupbase.py
Brian E. Granger -
r4518:fd892df5 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 ...
compilerop.py Loading ...
completer.py Loading ...
completerlib.py Loading ...
crashhandler.py Loading ...
debugger.py Loading ...
display.py Loading ...
display_trap.py Loading ...
displayhook.py Loading ...
displaypub.py Loading ...
error.py Loading ...
excolors.py Loading ...
extensions.py Loading ...
fakemodule.py Loading ...
formatters.py Loading ...
history.py Loading ...
hooks.py Loading ...
inputsplitter.py Loading ...
interactiveshell.py Loading ...
ipapi.py Loading ...
logger.py Loading ...
macro.py Loading ...
magic.py Loading ...
magic_arguments.py Loading ...
oinspect.py Loading ...
page.py Loading ...
payload.py Loading ...
payloadpage.py Loading ...
plugin.py Loading ...
prefilter.py Loading ...
profileapp.py Loading ...
profiledir.py Loading ...
prompts.py Loading ...
release.py Loading ...
shadowns.py Loading ...
shellapp.py Loading ...
splitinput.py Loading ...
ultratb.py Loading ...
usage.py Loading ...