[iep] 01/01: Merge tag 'upstream/3.7'

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository iep.

commit 1d10c952ffeb221df76b58f355e7de6258126f29
Merge: 43a7c40 03bd815
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Mon Sep 14 10:23:06 2015 +0100

    Merge tag 'upstream/3.7'
    
    Upstream version 3.7

 PKG-INFO                                           |   2 +-
 iep.egg-info/PKG-INFO                              |   2 +-
 iep.egg-info/SOURCES.txt                           |   6 +-
 iep.egg-info/requires.txt                          |   2 +-
 iep/__init__.py                                    |   4 +-
 iep/codeeditor/__init__.py                         |   8 +-
 iep/codeeditor/extensions/appearance.py            | 225 ++++++++++
 iep/contributors.txt                               |   7 +-
 iep/iepcore/assistant.py                           | 273 ++++++++++++
 iep/iepcore/baseTextCtrl.py                        |   4 +-
 iep/iepcore/iepLogging.py                          |   5 +-
 iep/iepcore/kernelbroker.py                        |   2 +-
 iep/iepcore/main.py                                |  19 +-
 iep/iepcore/menu.py                                |  32 +-
 iep/iepcore/shell.py                               |  12 +-
 iep/iepkernel/introspection.py                     |   2 +-
 iep/iepkernel/magic.py                             |   5 +-
 iep/resources/icons/application_cascade.png        | Bin 0 -> 524 bytes
 iep/resources/translations/iep_ca_ES.tr            | 276 +++++++-----
 iep/resources/translations/iep_de_DE.tr            | 276 +++++++-----
 iep/resources/translations/iep_es_ES.tr            | 276 +++++++-----
 iep/resources/translations/iep_fr_FR.tr            | 282 +++++++-----
 iep/resources/translations/iep_nl_NL.tr            | 281 +++++++-----
 .../translations/{iep_sk_SK.tr => iep_pt_BR.tr}    | 407 +++++++++--------
 iep/resources/translations/iep_pt_PT.tr            | 276 +++++++-----
 iep/resources/translations/iep_ru_RU.tr            | 276 +++++++-----
 iep/resources/translations/iep_sk_SK.tr            | 276 +++++++-----
 iep/resources/translations/iep_zh_CN.tr            | 276 +++++++-----
 iep/tools/__init__.py                              |   9 +-
 iep/tools/iepHistoryViewer.py                      |   7 +-
 iep/tools/iepLogger.py                             |   2 +-
 iep/util/{locale.py => _locale.py}                 |   3 +-
 iep/util/bootstrapconda.py                         | 486 +++++++++++++++++++++
 iep/util/iepwizard.py                              |   2 +-
 setup.cfg                                          |   4 +-
 35 files changed, 2723 insertions(+), 1302 deletions(-)

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