##// END OF EJS Templates
Upstream changes.
Upstream changes.

File last commit:

r1234:52b55407
r1576:2a5de779 merge
Show More
ipcontroller
20 lines | 702 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
__docformat__ = "restructuredtext en"
#-------------------------------------------------------------------------------
# Copyright (C) 2008 The IPython Development Team
#
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING, distributed as part of this software.
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
# Imports
#-------------------------------------------------------------------------------
if __name__ == '__main__':
from IPython.kernel.scripts import ipcontroller
ipcontroller.main()