##// END OF EJS Templates
Merging changes from Gael. These are fixes to make frontend 2.4 happy.
Merging changes from Gael. These are fixes to make frontend 2.4 happy.

File last commit:

r1234:52b55407
r1714:7b23eefb merge
Show More
__init__.py
13 lines | 580 B | text/x-python | PythonLexer
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 # 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
#-------------------------------------------------------------------------------