[spyder] 02/06: Merge tag 'upstream/2.2.1+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 e5c785da22bc8cfb137b4b6eb4cb8ed2f0212b68
Merge: 78fc2d2 c813c8c
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Thu Jul 11 22:12:46 2013 +0200

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

 PKG-INFO                                           |    4 +-
 bootstrap.py                                       |    2 +-
 doc/images/git_install_dialog.png                  |  Bin 0 -> 38663 bytes
 doc/installation.rst                               |  306 ++++-
 doc/projectexplorer.rst                            |   23 +
 setup.py                                           |   14 +-
 spyderlib/__init__.py                              |    2 +-
 spyderlib/images/editor/run_settings.png           |  Bin 0 -> 1836 bytes
 spyderlib/locale/es/LC_MESSAGES/spyderlib.mo       |  Bin 89445 -> 84405 bytes
 spyderlib/locale/es/LC_MESSAGES/spyderlib.po       | 1296 ++++++++++++--------
 spyderlib/locale/fr/LC_MESSAGES/spyderlib.mo       |  Bin 82778 -> 82778 bytes
 spyderlib/locale/fr/LC_MESSAGES/spyderlib.po       |  328 ++---
 spyderlib/locale/spyderlib.pot                     |  328 ++---
 spyderlib/pil_patch.py                             |   13 +-
 spyderlib/plugins/configdialog.py                  |   20 +-
 spyderlib/plugins/editor.py                        |   10 +-
 spyderlib/plugins/ipythonconsole.py                |   12 +-
 spyderlib/plugins/runconfig.py                     |   17 +-
 spyderlib/rope_patch.py                            |   35 +-
 spyderlib/spyder.py                                |   10 +-
 spyderlib/utils/codeanalysis.py                    |    2 +-
 spyderlib/utils/inspector/static/css/default.css   |    2 +-
 spyderlib/widgets/dicteditorutils.py               |    2 +-
 spyderlib/widgets/externalshell/sitecustomize.py   |   17 +-
 spyderlib/widgets/sourcecode/base.py               |   10 +-
 .../locale/es/LC_MESSAGES/p_breakpoints.mo         |  Bin 812 -> 752 bytes
 spyderplugins/locale/es/LC_MESSAGES/p_profiler.mo  |  Bin 790 -> 790 bytes
 spyderplugins/locale/es/LC_MESSAGES/p_pylint.mo    |  Bin 1090 -> 1090 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
 31 files changed, 1473 insertions(+), 980 deletions(-)

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