##// END OF EJS Templates
Merging Gael's branch into trunk. ...
Merging Gael's branch into trunk. Numerous fixes and improvements to the new wx GUI. Many of these bugs fix problems on Windows (Vista). The full IPython test suite now passes and ipythonx runs on the major platforms. Also fixed a small bug in setupegg.py.

File last commit:

r1234:52b55407
r1664:5771a5f8 merge
Show More
__init__.py
9 lines | 407 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.
#-------------------------------------------------------------------------------