[spyder] 07/08: Merge tag 'upstream/2.3.0_beta4+dfsg' into experimental

[Frédéric-Emmanuel Picca]

This is an automated email from the git hooks/post-receive script.

picca pushed a commit to branch experimental
in repository spyder.

commit a1e0d3d503bd8e60abc42b0aec9235827ca9a532
Merge: 9624aba 3804263
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Thu Apr 10 22:07:34 2014 +0200

    Merge tag 'upstream/2.3.0_beta4+dfsg' into experimental
    
    Upstream version 2.3.0~beta4+dfsg

 MANIFEST.in                                        |   1 +
 PKG-INFO                                           |   4 +-
 doc/installation.rst                               |   2 +
 img_src/spyder3.png                                | Bin 0 -> 8259 bytes
 scripts/spyder3                                    |   3 +
 scripts/spyder3.desktop                            |  14 +
 setup.py                                           |  20 +-
 spyderlib/__init__.py                              |   2 +-
 spyderlib/config.py                                | 236 ++++++++++---
 spyderlib/guiconfig.py                             |  36 +-
 spyderlib/images/filetypes/enaml.png               | Bin 0 -> 743 bytes
 spyderlib/images/filetypes/jl.png                  | Bin 0 -> 1166 bytes
 spyderlib/plugins/__init__.py                      |  14 +-
 spyderlib/plugins/configdialog.py                  |   3 +-
 spyderlib/plugins/editor.py                        |  86 +++--
 spyderlib/plugins/externalconsole.py               |  36 +-
 spyderlib/plugins/ipythonconsole.py                |   4 +-
 spyderlib/plugins/outlineexplorer.py               |   6 +-
 spyderlib/plugins/projectexplorer.py               |   2 +-
 spyderlib/plugins/workingdirectory.py              |  26 +-
 spyderlib/scientific_startup.py                    |   6 +-
 spyderlib/spyder.py                                |  45 +--
 spyderlib/userconfig.py                            | 261 ++++++++------
 spyderlib/utils/codeanalysis.py                    |   2 +-
 spyderlib/utils/defaults-2.4.0.ini                 | 380 +++++++++++++++++++++
 spyderlib/utils/introspection/base.py              |  74 ++--
 spyderlib/utils/programs.py                        |   4 +-
 spyderlib/utils/sourcecode.py                      |   4 +-
 spyderlib/utils/system.py                          |  35 +-
 spyderlib/utils/vcs.py                             |   3 +-
 spyderlib/widgets/editor.py                        |  62 ++--
 spyderlib/widgets/findreplace.py                   |  41 +--
 spyderlib/widgets/ipython.py                       |  29 +-
 spyderlib/widgets/shell.py                         |  35 +-
 spyderlib/widgets/sourcecode/base.py               |   5 -
 spyderlib/widgets/sourcecode/codeeditor.py         | 109 +++---
 spyderlib/widgets/sourcecode/syntaxhighlighters.py |  24 ++
 spyderlib/widgets/status.py                        |   6 +
 spyderplugins/p_breakpoints.py                     |   2 +-
 spyderplugins/p_profiler.py                        |   2 +-
 spyderplugins/p_pylint.py                          |   2 +-
 41 files changed, 1166 insertions(+), 460 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/spyder.git