[spyder] 01/03: Merge tag 'upstream/2.3.4+dfsg1'

[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 6673cf03de78f21cd7ce7b863091ee942394f498
Merge: 538a6bc d978abd
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sat Mar 28 08:42:19 2015 +0100

    Merge tag 'upstream/2.3.4+dfsg1'
    
    Upstream version 2.3.4+dfsg1

 CHANGELOG                                          | 1137 --------------------
 PKG-INFO                                           |    4 +-
 setup.cfg                                          |    5 -
 spyder.egg-info/PKG-INFO                           |   31 -
 spyder.egg-info/SOURCES.txt                        |  690 ------------
 spyder.egg-info/dependency_links.txt               |    1 -
 spyder.egg-info/top_level.txt                      |    2 -
 spyderlib/__init__.py                              |    2 +-
 spyderlib/config.py                                |    4 +-
 spyderlib/ipythonconfig.py                         |    4 +-
 spyderlib/locale/es/LC_MESSAGES/spyderlib.mo       |  Bin 97333 -> 97489 bytes
 spyderlib/locale/es/LC_MESSAGES/spyderlib.po       |  929 ++++++++--------
 spyderlib/locale/fr/LC_MESSAGES/spyderlib.mo       |  Bin 99190 -> 99259 bytes
 spyderlib/locale/fr/LC_MESSAGES/spyderlib.po       |  930 ++++++++--------
 spyderlib/locale/spyderlib.pot                     |  915 ++++++++--------
 spyderlib/plugins/configdialog.py                  |   22 +-
 spyderlib/plugins/editor.py                        |   18 +-
 spyderlib/plugins/externalconsole.py               |    4 +-
 spyderlib/plugins/inspector.py                     |   17 +-
 spyderlib/plugins/ipythonconsole.py                |   66 +-
 spyderlib/pygments_patch.py                        |    3 +-
 spyderlib/qt/QtCore.py                             |    4 +-
 spyderlib/scientific_startup.py                    |    8 +-
 spyderlib/spyder.py                                |   44 +-
 spyderlib/userconfig.py                            |   12 +-
 spyderlib/utils/external/__init__.py               |    4 -
 spyderlib/utils/inspector/static/css/default.css   |    2 +-
 spyderlib/utils/inspector/templates/warning.html   |   18 +-
 spyderlib/utils/introspection/plugin_manager.py    |   16 +-
 spyderlib/utils/introspection/rope_plugin.py       |    3 +-
 spyderlib/utils/programs.py                        |   28 +-
 spyderlib/utils/qthelpers.py                       |    5 +-
 spyderlib/widgets/editor.py                        |   11 +-
 spyderlib/widgets/externalshell/baseshell.py       |    4 +-
 spyderlib/widgets/externalshell/pythonshell.py     |   15 +-
 spyderlib/widgets/externalshell/sitecustomize.py   |  183 ++--
 .../widgets/externalshell/start_ipython_kernel.py  |   57 +-
 spyderlib/widgets/ipython.py                       |   14 +-
 spyderlib/widgets/projectexplorer.py               |    3 +-
 spyderlib/widgets/sourcecode/base.py               |   13 +-
 spyderlib/widgets/sourcecode/codeeditor.py         |    5 +-
 .../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 1137 -> 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 2594 -> 2594 bytes
 47 files changed, 1720 insertions(+), 3513 deletions(-)

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