##// 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 / UserConfig
__init__.py Loading ...
ipy_user_conf.py Loading ...
ipythonrc Loading ...
ipythonrc-math Loading ...
ipythonrc-numeric Loading ...
ipythonrc-physics Loading ...
ipythonrc-pysh Loading ...
ipythonrc-tutorial Loading ...