##// END OF EJS Templates
[merge] Merging with upstream trunk.
[merge] Merging with upstream trunk.
Fernando Perez -
r2107:3611aca7 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 ...