##// END OF EJS Templates
merged from ~fdo.perez/ipython/trunk-dev
merged from ~fdo.perez/ipython/trunk-dev

File last commit:

r2296:ce29ca4f
r2469:81d5b6be merge
Show More
ipcontroller
18 lines | 649 B | text/plain | TextLexer
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 #!/usr/bin/env python
# encoding: utf-8
Brian Granger
Work on ipcontroller....
r2296 #-----------------------------------------------------------------------------
# Copyright (C) 2008-2009 The IPython Development Team
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 #
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING, distributed as part of this software.
Brian Granger
Work on ipcontroller....
r2296 #-----------------------------------------------------------------------------
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234
Brian Granger
Work on ipcontroller....
r2296 #-----------------------------------------------------------------------------
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 # Imports
Brian Granger
Work on ipcontroller....
r2296 #-----------------------------------------------------------------------------
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234
Brian Granger
Work on ipcontroller....
r2296 from IPython.kernel.ipcontrollerapp import launch_new_instance
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234
Brian Granger
Work on ipcontroller....
r2296 launch_new_instance()