##// 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 / deathrow / oldfrontend
cocoa
process
tests
wx
asyncfrontendbase.py Loading ...
frontendbase.py Loading ...
linefrontendbase.py Loading ...
prefilterfrontend.py Loading ...
zopeinterface.py Loading ...