##// 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 / external
Itpl.py Loading ...
__init__.py Loading ...
_numpy_testing_utils.py Loading ...
argparse.py Loading ...
configobj.py Loading ...
decorator.py Loading ...
decorators.py Loading ...
guid.py Loading ...
mglob.py Loading ...
path.py Loading ...
pretty.py Loading ...
pyparsing.py Loading ...
simplegeneric.py Loading ...
validate.py Loading ...