##// END OF EJS Templates
Merge branch 'epatters-qtfrontend' into kernelmanager...
Merge branch 'epatters-qtfrontend' into kernelmanager Conflicts: IPython/frontend/qt/kernelmanager.py
Brian Granger -
r2734:80d1ecb3 merge
Show More
Name Size Modified Last Commit Author
/ IPython / config
default
profile
tests
__init__.py Loading ...
loader.py Loading ...