##// 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 / attic
COPYING Loading ...
ChangeLog Loading ...
ipnb_google_soc.lyx Loading ...
nbexample.py Loading ...
nbexample_latex.py Loading ...
nbexample_output.py Loading ...
new_design.lyx Loading ...