[spyder] 02/04: Merge tag 'upstream/2.2.4+dfsg'

[Frédéric-Emmanuel Picca]

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

picca pushed a commit to branch master
in repository spyder.

commit ba555afff9641332ba14d81eccf5ebbc5c6b641b
Merge: 928ad16 d3aaede
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Fri Sep 6 21:22:13 2013 +0200

    Merge tag 'upstream/2.2.4+dfsg'
    
    Upstream version 2.2.4+dfsg

 CHANGELOG                                          |  819 +++++++++++
 LICENSE                                            |  334 +++++
 MANIFEST.in                                        |    2 +
 PKG-INFO                                           |   64 +-
 spyderlib/__init__.py                              |    2 +-
 spyderlib/baseconfig.py                            |   19 +-
 spyderlib/config.py                                |   10 +-
 spyderlib/images/editor/breakpoint_small.png       |  Bin 815 -> 562 bytes
 spyderlib/locale/es/LC_MESSAGES/spyderlib.mo       |  Bin 90036 -> 92547 bytes
 spyderlib/locale/es/LC_MESSAGES/spyderlib.po       | 1487 +++++++++++---------
 spyderlib/locale/fr/LC_MESSAGES/spyderlib.mo       |  Bin 85934 -> 84192 bytes
 spyderlib/locale/fr/LC_MESSAGES/spyderlib.po       |  996 ++++++-------
 spyderlib/locale/spyderlib.pot                     |  929 ++++++------
 spyderlib/plugins/editor.py                        |  122 +-
 spyderlib/plugins/externalconsole.py               |   46 +-
 spyderlib/plugins/history.py                       |    4 +
 spyderlib/plugins/inspector.py                     |    7 +-
 spyderlib/plugins/ipythonconsole.py                |   75 +-
 spyderlib/spyder.py                                |   36 +-
 spyderlib/utils/codeanalysis.py                    |    6 +-
 spyderlib/utils/programs.py                        |    8 +-
 spyderlib/utils/qthelpers.py                       |    7 +
 spyderlib/widgets/externalshell/pythonshell.py     |   15 +-
 spyderlib/widgets/externalshell/sitecustomize.py   |    8 +-
 .../widgets/externalshell/start_ipython_kernel.py  |   59 +-
 spyderlib/widgets/ipython.py                       |   25 +-
 spyderlib/widgets/projectexplorer.py               |    2 +-
 spyderlib/windows/spyder.ico                       |  Bin 100763 -> 0 bytes
 spyderlib/windows/spyder_light.ico                 |  Bin 99495 -> 0 bytes
 .../locale/es/LC_MESSAGES/p_breakpoints.mo         |  Bin 752 -> 752 bytes
 spyderplugins/locale/es/LC_MESSAGES/p_profiler.mo  |  Bin 790 -> 790 bytes
 spyderplugins/locale/es/LC_MESSAGES/p_pylint.mo    |  Bin 1090 -> 1228 bytes
 .../locale/fr/LC_MESSAGES/p_breakpoints.mo         |  Bin 731 -> 731 bytes
 spyderplugins/locale/fr/LC_MESSAGES/p_profiler.mo  |  Bin 2191 -> 2191 bytes
 spyderplugins/locale/fr/LC_MESSAGES/p_pylint.mo    |  Bin 2458 -> 2458 bytes
 spyderplugins/p_breakpoints.py                     |    2 +-
 36 files changed, 3274 insertions(+), 1810 deletions(-)

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