##// END OF EJS Templates
Merge branch 'master' of git://github.com/ipython/ipython into qtfrontend and fix conflicts in setupbase.py....
Merge branch 'master' of git://github.com/ipython/ipython into qtfrontend and fix conflicts in setupbase.py. Conflicts: setupbase.py
epatters -
r2664:6080a84e merge
Show More
Name Size Modified Last Commit Author
/ IPython / config / profile
__init__.py Loading ...
ipython_config_cluster.py Loading ...
ipython_config_math.py Loading ...
ipython_config_numeric.py Loading ...
ipython_config_pylab.py Loading ...
ipython_config_pysh.py Loading ...
ipython_config_sympy.py Loading ...