##// END OF EJS Templates
Merge pull request #1707 from bfroehle/_1532_qtconsole_gui_switch...
Merge pull request #1707 from bfroehle/_1532_qtconsole_gui_switch move gui/pylab to shellapp base class If both --gui and --pylab are given, we use the value in --pylab, just like the terminal IPython application. Closes #1532

File last commit:

r5390:c82649ea
r7101:bd1da13c merge
Show More
__init__.py
13 lines | 585 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"
#-------------------------------------------------------------------------------
Matthias BUSSONNIER
update copyright to 2011/20xx-2011...
r5390 # Copyright (C) 2008-2011 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.
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
# Imports
#-------------------------------------------------------------------------------