[spyder] 02/05: Merge tag 'upstream/2.3.0_rc+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 faf8e6fc30065b2eef524b9af1bc590f9c5c81d2
Merge: 250488f 40adbe0
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Thu May 29 11:02:59 2014 +0200

    Merge tag 'upstream/2.3.0_rc+dfsg' into experimental
    
    Upstream version 2.3.0~rc+dfsg

 PKG-INFO                                           |     4 +-
 setup.py                                           |     2 +-
 spyderlib/__init__.py                              |     2 +-
 spyderlib/baseconfig.py                            |     2 +-
 spyderlib/config.py                                |   193 +-
 spyderlib/defaults/Readme.txt                      |    25 +
 spyderlib/{utils => defaults}/defaults-2.4.0.ini   |   123 +
 .../defaults-3.0.0.ini}                            |   221 +-
 spyderlib/guiconfig.py                             |     6 +-
 spyderlib/locale/es/LC_MESSAGES/spyderlib.mo       |   Bin 92726 -> 93610 bytes
 spyderlib/locale/es/LC_MESSAGES/spyderlib.po       |  2505 ++---
 spyderlib/locale/fr/LC_MESSAGES/spyderlib.mo       |   Bin 85560 -> 95217 bytes
 spyderlib/locale/fr/LC_MESSAGES/spyderlib.po       | 10381 ++++++++++---------
 spyderlib/locale/spyderlib.pot                     |  8244 +++++++--------
 spyderlib/plugins/__init__.py                      |    21 +-
 spyderlib/plugins/configdialog.py                  |     1 +
 spyderlib/plugins/editor.py                        |    20 +-
 spyderlib/plugins/externalconsole.py               |    49 +-
 spyderlib/plugins/ipythonconsole.py                |    31 +-
 spyderlib/spyder.py                                |   100 +-
 spyderlib/userconfig.py                            |    19 +-
 spyderlib/utils/codeanalysis.py                    |    98 +-
 spyderlib/utils/external/pickleshare.py            |     3 +-
 spyderlib/widgets/editor.py                        |    29 +-
 spyderlib/widgets/editortools.py                   |     2 +-
 spyderlib/widgets/findreplace.py                   |     8 +-
 spyderlib/widgets/formlayout.py                    |     4 +-
 spyderlib/widgets/internalshell.py                 |     2 -
 spyderlib/widgets/ipython.py                       |     6 +-
 spyderlib/widgets/mixins.py                        |     2 +-
 spyderlib/widgets/sourcecode/base.py               |   144 +-
 spyderlib/widgets/sourcecode/codeeditor.py         |    51 +-
 spyderlib/widgets/sourcecode/syntaxhighlighters.py |   198 +-
 .../locale/es/LC_MESSAGES/p_breakpoints.mo         |   Bin 772 -> 772 bytes
 spyderplugins/locale/es/LC_MESSAGES/p_profiler.mo  |   Bin 794 -> 794 bytes
 spyderplugins/locale/es/LC_MESSAGES/p_pylint.mo    |   Bin 1204 -> 1137 bytes
 .../locale/fr/LC_MESSAGES/p_breakpoints.mo         |   Bin 762 -> 762 bytes
 spyderplugins/locale/fr/LC_MESSAGES/p_profiler.mo  |   Bin 2342 -> 2342 bytes
 spyderplugins/locale/fr/LC_MESSAGES/p_pylint.mo    |   Bin 2633 -> 2088 bytes
 spyderplugins/p_breakpoints.py                     |     4 +-
 40 files changed, 11543 insertions(+), 10957 deletions(-)

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