##// END OF EJS Templates
Merge branch 'newkernel' into upstream-newkernel...
Merge branch 'newkernel' into upstream-newkernel Conflicts: IPython/frontend/qt/console/scripts/ipythonqt.py IPython/zmq/ipkernel.py
Brian Granger -
r2873:087388fb merge
Show More
Name Size Modified Last Commit Author
/ IPython / config / default
__init__.py Loading ...
ipcluster_config.py Loading ...
ipcontroller_config.py Loading ...
ipengine_config.py Loading ...
ipython_config.py Loading ...