##// END OF EJS Templates
Merge branch 'newkernel' of git://github.com/ellisonbg/ipython into qtfrontend...
Merge branch 'newkernel' of git://github.com/ellisonbg/ipython into qtfrontend Conflicts: IPython/frontend/qt/console/frontend_widget.py IPython/frontend/qt/console/ipython_widget.py IPython/zmq/ipkernel.py
epatters -
r2795:e518f8e9 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 ...