##// END OF EJS Templates
Merge branch 'master' of git://github.com/ipython/ipython into qtfrontend and fix conflicts in setupbase.py....
Merge branch 'master' of git://github.com/ipython/ipython into qtfrontend and fix conflicts in setupbase.py. Conflicts: setupbase.py
epatters -
r2664:6080a84e 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 ...
inputhook.py Loading ...
inputhookgtk.py Loading ...
inputhookwx.py Loading ...
irunner.py Loading ...
pylabtools.py Loading ...