##// END OF EJS Templates
Merge branch 'master' into interact-range-widgets...
Merge branch 'master' into interact-range-widgets Conflicts: IPython/html/static/style/ipython.min.css IPython/html/static/style/style.min.css IPython/html/static/widgets/js/widget_int.js
Gordon Ball -
r17589:157df08f merge
Show More
Name Size Modified Last Commit Author
/ IPython / kernel
blocking
comm
inprocess
ioloop
tests
zmq
__init__.py Loading ...
__main__.py Loading ...
adapter.py Loading ...
channels.py Loading ...
channelsabc.py Loading ...
client.py Loading ...
clientabc.py Loading ...
connect.py Loading ...
kernelspec.py Loading ...
kernelspecapp.py Loading ...
launcher.py Loading ...
manager.py Loading ...
managerabc.py Loading ...
multikernelmanager.py Loading ...
restarter.py Loading ...