##// END OF EJS Templates
Merging latest trunk....
Merging latest trunk. I got a criss-cross merge in this and did merge --weave. Hope this is OK.
Brian Granger -
r1890:c3323314 merge
Show More
Name Size Modified Last Commit Author
/ IPython / gui / wx
__init__.py Loading ...
ipshell_nonblocking.py Loading ...
ipython_history.py Loading ...
ipython_view.py Loading ...
thread_ex.py Loading ...
wxIPython.py Loading ...