##// END OF EJS Templates
Merging from upstream (with a few local cleanups when resolving conflicts).
Merging from upstream (with a few local cleanups when resolving conflicts).
Fernando Perez -
r1866:bca2d8bf merge
Show More
Name Size Modified Last Commit Author
/ IPython
Extensions
UserConfig
config
external
frontend
gui
kernel
testing
tests
tools
ColorANSI.py Loading ...
ConfigLoader.py Loading ...
CrashHandler.py Loading ...
DPyGetOpt.py Loading ...
Debugger.py Loading ...
FakeModule.py Loading ...
Gnuplot2.py Loading ...
GnuplotInteractive.py Loading ...
GnuplotRuntime.py Loading ...
Itpl.py Loading ...
Logger.py Loading ...
Magic.py Loading ...
OInspect.py Loading ...
OutputTrap.py Loading ...
Prompts.py Loading ...
PyColorize.py Loading ...
Release.py Loading ...
Shell.py Loading ...
__init__.py Loading ...
background_jobs.py Loading ...
completer.py Loading ...
deep_reload.py Loading ...
demo.py Loading ...
dtutils.py Loading ...
excolors.py Loading ...
generics.py Loading ...
genutils.py Loading ...
history.py Loading ...
hooks.py Loading ...
ipapi.py Loading ...
iplib.py Loading ...
ipmaker.py Loading ...
ipstruct.py Loading ...
irunner.py Loading ...
macro.py Loading ...
numutils.py Loading ...
platutils.py Loading ...
platutils_dummy.py Loading ...
platutils_posix.py Loading ...
platutils_win32.py Loading ...
prefilter.py Loading ...
rlineimpl.py Loading ...
shadowns.py Loading ...
shellglobals.py Loading ...
strdispatch.py Loading ...
twshell.py Loading ...
ultraTB.py Loading ...
upgrade_dir.py Loading ...
usage.py Loading ...
wildcard.py Loading ...
winconsole.py Loading ...