##// END OF EJS Templates
Merging upstream changes from trunk (after fixing small conflicts).
Merging upstream changes from trunk (after fixing small conflicts).
Fernando Perez -
r1872:d21e2734 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 ...