##// END OF EJS Templates
Merge remote-tracking branch 'public-upstream/master' into links-rebase...
Merge remote-tracking branch 'public-upstream/master' into links-rebase Conflicts: examples/Interactive Widgets/Widget Events.ipynb
Jason Grout -
r19202:bab26ab3 merge
Show More
Name Size Modified Last Commit Author
/ IPython / kernel / zmq
gui
pylab
tests
__init__.py Loading ...
datapub.py Loading ...
displayhook.py Loading ...
embed.py Loading ...
eventloops.py Loading ...
heartbeat.py Loading ...
iostream.py Loading ...
ipkernel.py Loading ...
kernelapp.py Loading ...
kernelbase.py Loading ...
log.py Loading ...
logtopics.rst Loading ...
parentpoller.py Loading ...
serialize.py Loading ...
session.py Loading ...
zmqshell.py Loading ...