##// 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
/ tools
alldeps
build_release Loading ...
check_sources.py Loading ...
gitwash_dumper.py Loading ...
make_tarball.py Loading ...
release Loading ...
run_ipy_in_profiler.py Loading ...
testupload Loading ...
toollib.py Loading ...