##// 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
/ IPython / testing
plugin
tests
__init__.py Loading ...
_doctest26.py Loading ...
_paramtestpy2.py Loading ...
_paramtestpy3.py Loading ...
decorators.py Loading ...
decorators_trial.py Loading ...
globalipapp.py Loading ...
iptest.py Loading ...
ipunittest.py Loading ...
mkdoctests.py Loading ...
nosepatch.py Loading ...
parametric.py Loading ...
tools.py Loading ...
util.py Loading ...