##// END OF EJS Templates
Merge branch 'newkernel' of git://github.com/ellisonbg/ipython into qtfrontend...
Merge branch 'newkernel' of git://github.com/ellisonbg/ipython into qtfrontend Conflicts: IPython/zmq/pykernel.py

File last commit:

r2760:afe1263a
r2777:9b98ba4e merge
Show More
ipython
6 lines | 134 B | text/plain | TextLexer
Ville M. Vainio
crlf -> lf
r1032 #!/usr/bin/env python
# -*- coding: utf-8 -*-
Brian Granger
Moving and renaming in preparation of subclassing InteractiveShell....
r2760 from IPython.frontend.terminal.ipapp import launch_new_instance
Fernando Perez
Complete first pass on testing system. All tests pass on my box. Whew....
r1435
Brian Granger
Removed shell.py entirely and made the embedded shell a proper subclass....
r2206 launch_new_instance()