##// END OF EJS Templates
Merge branch 'master' of https://github.com/avandever/ipython Conflicts: IPython/core/completerlib.py
Andrew Vandever -
r8542:f4417849 merge
Show More
Name Size Modified Last Commit Author
/ IPython / lib
tests
__init__.py Loading ...
backgroundjobs.py Loading ...
clipboard.py Loading ...
deepreload.py Loading ...
demo.py Loading ...
display.py Loading ...
guisupport.py Loading ...
inputhook.py Loading ...
inputhookglut.py Loading ...
inputhookgtk.py Loading ...
inputhookgtk3.py Loading ...
inputhookpyglet.py Loading ...
inputhookqt4.py Loading ...
inputhookwx.py Loading ...
irunner.py Loading ...
kernel.py Loading ...
latextools.py Loading ...
pretty.py Loading ...
security.py Loading ...