##// END OF EJS Templates
Merge branch 'epatters-qtfrontend' into kernelmanager...
Merge branch 'epatters-qtfrontend' into kernelmanager Conflicts: IPython/frontend/qt/kernelmanager.py IPython/frontend/qt/util.py
Brian Granger -
r2726:7ecaeab5 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 ...