##// END OF EJS Templates
Merging upstream change from module-reorg branch....
Merging upstream change from module-reorg branch. Recently lp:ipython was merged into module-reorg. This is propagating that merge into this inputhook branch.
Brian Granger -
r2156:ed44a843 merge
Show More
Name Size Modified Last Commit Author
/ IPython / core
tests
__init__.py Loading ...
completer.py Loading ...
crashhandler.py Loading ...
debugger.py Loading ...
excolors.py Loading ...
fakemodule.py Loading ...
history.py Loading ...
hooks.py Loading ...
ipapi.py Loading ...
iplib.py Loading ...
ipmaker.py Loading ...
logger.py Loading ...
macro.py Loading ...
magic.py Loading ...
oinspect.py Loading ...
outputtrap.py Loading ...
prefilter.py Loading ...
prompts.py Loading ...
release.py Loading ...
shadowns.py Loading ...
shell.py Loading ...
ultratb.py Loading ...
usage.py Loading ...