##// 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 / utils / tests
__init__.py Loading ...
test_imports.py Loading ...
test_io.py Loading ...
test_notification.py Loading ...
test_path.py Loading ...
test_process.py Loading ...
test_traitlets.py Loading ...
test_wildcard.py Loading ...