##// 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
/ scripts
iptest Loading ...
ipython Loading ...
ipython-wx Loading ...
ipython_win_post_install.py Loading ...
ipythonx Loading ...
irunner Loading ...
pycolor Loading ...