##// END OF EJS Templates
Merge branch 'newkernel' into upstream-newkernel...
Merge branch 'newkernel' into upstream-newkernel Conflicts: IPython/frontend/qt/console/scripts/ipythonqt.py IPython/zmq/ipkernel.py
Brian Granger -
r2873:087388fb merge
Show More
Name Size Modified Last Commit Author
/ tools
alldeps
build_release Loading ...
check_sources.py Loading ...
compile.py Loading ...
gitwash_dumper.py Loading ...
make_tarball.py Loading ...
release Loading ...
run_ipy_in_profiler.py Loading ...
testupload Loading ...
toollib.py Loading ...
update_revnum.py Loading ...