##// END OF EJS Templates
Merging -r 1181 from lp:ipython....
Merging -r 1181 from lp:ipython. A few changes were made to resolve conflicts: * clipboard.py moved to core. * Imports fixed.
Brian Granger -
r2128:edd2e623 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 ...
shellglobals.py Loading ...
ultratb.py Loading ...
usage.py Loading ...