##// END OF EJS Templates
Merge branch 'master' of https://github.com/avandever/ipython Conflicts: IPython/core/completerlib.py

File last commit:

r7542:39d2bbd9
r8542:f4417849 merge
Show More
__init__.py
18 lines | 664 B | text/x-python | PythonLexer
# 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
#-------------------------------------------------------------------------------
from .application import *
from .configurable import *
from .loader import Config