##// END OF EJS Templates
Merge branch 'master' into kernelmanager...
Merge branch 'master' into kernelmanager Conflicts: IPython/utils/traitlets.py
Brian Granger -
r2752:5016a14f merge
Show More
Name Size Modified Last Commit Author
/ IPython / utils
tests
PyColorize.py Loading ...
__init__.py Loading ...
attic.py Loading ...
autoattr.py Loading ...
coloransi.py Loading ...
cursesimport.py Loading ...
data.py Loading ...
decorators.py Loading ...
dir2.py Loading ...
doctestreload.py Loading ...
frame.py Loading ...
generics.py Loading ...
growl.py Loading ...
importstring.py Loading ...
io.py Loading ...
ipstruct.py Loading ...
notification.py Loading ...
path.py Loading ...
pickleshare.py Loading ...
process.py Loading ...
rlineimpl.py Loading ...
strdispatch.py Loading ...
sysinfo.py Loading ...
syspathcontext.py Loading ...
terminal.py Loading ...
text.py Loading ...
timing.py Loading ...
traitlets.py Loading ...
upgradedir.py Loading ...
warn.py Loading ...
wildcard.py Loading ...