##// 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 / core / tests
__init__.py Loading ...
refbug.py Loading ...
simpleerr.py Loading ...
tclass.py Loading ...
test_autocall.py Loading ...
test_completer.py Loading ...
test_component.py Loading ...
test_fakemodule.py Loading ...
test_handlers.py Loading ...
test_imports.py Loading ...
test_inputsplitter.py Loading ...
test_iplib.py Loading ...
test_magic.py Loading ...
test_prefilter.py Loading ...
test_run.py Loading ...