##// END OF EJS Templates
Merge branch 'master' into htmlnotebook...
Merge branch 'master' into htmlnotebook Conflicts: setupbase.py
Brian E. Granger -
r4518:fd892df5 merge
Show More
Name Size Modified Last Commit Author
/ IPython / zmq
gui
pylab
tests
__init__.py Loading ...
blockingkernelmanager.py Loading ...
completer.py Loading ...
displayhook.py Loading ...
entry_point.py Loading ...
frontend.py Loading ...
heartbeat.py Loading ...
iostream.py Loading ...
ipkernel.py Loading ...
kernelapp.py Loading ...
kernelmanager.py Loading ...
log.py Loading ...
logtopics.rst Loading ...
parentpoller.py Loading ...
pykernel.py Loading ...
session.py Loading ...
zmqshell.py Loading ...