##// END OF EJS Templates
Merge branch 'kernel-logging' of https://github.com/omazapa/ipython into omazapa-kernel-logging...
Merge branch 'kernel-logging' of https://github.com/omazapa/ipython into omazapa-kernel-logging Fixed conflicts arising from updates to using session send instead of directly accessing the sockets. Conflicts: IPython/zmq/iostream.py IPython/zmq/ipkernel.py
Fernando Perez -
r3322:9d65bd5f merge
Show More
Name Size Modified Last Commit Author
/ docs / sphinxext
apigen.py Loading ...
docscrape.py Loading ...
docscrape_sphinx.py Loading ...
inheritance_diagram.py Loading ...
ipython_console_highlighting.py Loading ...
ipython_directive.py Loading ...
numpydoc.py Loading ...