[spyder] 05/06: Merge tag 'upstream/2.2.2+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 2eb04759a28fefd9d0c8c45900db3e0087450d2d
Merge: 5eeed14 f0849c2
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Mon Aug 19 21:12:10 2013 +0200

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

 PKG-INFO                                           |    4 +-
 bootstrap.py                                       |    3 +
 spyderlib/__init__.py                              |    2 +-
 spyderlib/config.py                                |   11 +-
 spyderlib/images/actions/arrow-continue.png        |  Bin 0 -> 1911 bytes
 spyderlib/images/actions/control.png               |  Bin 396 -> 0 bytes
 spyderlib/images/actions/maximize.png              |  Bin 1109 -> 1121 bytes
 spyderlib/images/actions/stop_debug.png            |  Bin 0 -> 1746 bytes
 spyderlib/images/actions/unmaximize.png            |  Bin 944 -> 1012 bytes
 spyderlib/images/actions/window_fullscreen.png     |  Bin 833 -> 315 bytes
 spyderlib/images/actions/window_nofullscreen.png   |  Bin 962 -> 748 bytes
 spyderlib/images/editor/breakpoint.png             |  Bin 333 -> 0 bytes
 spyderlib/images/editor/breakpoint_big.png         |  Bin 0 -> 2084 bytes
 spyderlib/images/editor/breakpoint_cond.png        |  Bin 312 -> 0 bytes
 spyderlib/images/editor/breakpoint_cond_big.png    |  Bin 0 -> 2084 bytes
 spyderlib/images/editor/breakpoint_cond_small.png  |  Bin 0 -> 765 bytes
 spyderlib/images/editor/breakpoint_small.png       |  Bin 0 -> 815 bytes
 spyderlib/images/editor/debug.png                  |  Bin 0 -> 2079 bytes
 spyderlib/images/editor/run.png                    |  Bin 1706 -> 765 bytes
 spyderlib/images/editor/run_again.png              |  Bin 1735 -> 1357 bytes
 spyderlib/images/editor/run_selection.png          |  Bin 1198 -> 909 bytes
 spyderlib/images/editor/run_settings.png           |  Bin 1836 -> 1286 bytes
 spyderlib/images/filetypes/js.png                  |  Bin 0 -> 488 bytes
 spyderlib/locale/es/LC_MESSAGES/spyderlib.mo       |  Bin 84405 -> 90036 bytes
 spyderlib/locale/es/LC_MESSAGES/spyderlib.po       | 9251 ++++++++++----------
 spyderlib/locale/fr/LC_MESSAGES/spyderlib.mo       |  Bin 82778 -> 83263 bytes
 spyderlib/locale/fr/LC_MESSAGES/spyderlib.po       |  463 +-
 spyderlib/locale/spyderlib.pot                     |  458 +-
 spyderlib/plugins/editor.py                        |   21 +-
 spyderlib/plugins/history.py                       |    3 +-
 spyderlib/plugins/inspector.py                     |    3 +-
 spyderlib/plugins/ipythonconsole.py                |    6 +-
 spyderlib/spyder.py                                |   22 +-
 spyderlib/widgets/editor.py                        |   41 +-
 spyderlib/widgets/explorer.py                      |    4 +-
 spyderlib/widgets/shell.py                         |   16 +-
 spyderlib/widgets/sourcecode/base.py               |   15 +-
 spyderlib/widgets/sourcecode/codeeditor.py         |   18 +-
 spyderlib/widgets/sourcecode/syntaxhighlighters.py |    4 +
 .../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 -> 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
 spyderplugins/widgets/pylintgui.py                 |   29 +-
 46 files changed, 5256 insertions(+), 5118 deletions(-)

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