##// 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 / gui / wx
__init__.py Loading ...
ipshell_nonblocking.py Loading ...
ipython_history.py Loading ...
ipython_view.py Loading ...
thread_ex.py Loading ...
wxIPython.py Loading ...