[pyzo] 17/19: Merge tag 'v4.2.1' into debian/master

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/master
in repository pyzo.

commit 9b36d3aff91ecde1c16c7cc1757abbad407193f9
Merge: 572f1a1 c329227
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Thu Jun 30 22:20:27 2016 +0100

    Merge tag 'v4.2.1' into debian/master

 pyzo/__init__.py                                   |  76 ++++----
 pyzo/codeeditor/extensions/appearance.py           | 217 ++++++++++++++++-----
 pyzo/codeeditor/highlighter.py                     |   8 +-
 pyzo/codeeditor/parsers/python_parser.py           |  17 +-
 pyzo/codeeditor/parsers/tokens.py                  |  12 ++
 pyzo/contributors.txt                              |   1 +
 pyzo/core/editor.py                                |   1 +
 pyzo/core/main.py                                  |   3 +-
 pyzo/core/menu.py                                  |   2 +
 pyzo/pyzokernel/debug.py                           |   2 +-
 pyzo/pyzokernel/guiintegration.py                  |  32 +--
 pyzo/pyzokernel/magic.py                           |   8 +-
 pyzo/pyzokernel/start.py                           |   6 +-
 pyzo/resources/defaultConfig.ssdf                  |   1 +
 pyzo/resources/icons/README.md                     |   2 +
 ...tion_eraser.png => pyzo_application_eraser.png} | Bin
 ...on_refresh.png => pyzo_application_refresh.png} | Bin
 ...cation_shell.png => pyzo_application_shell.png} | Bin
 ...tion_wrench.png => pyzo_application_wrench.png} | Bin
 ...{debug_continue.png => pyzo_debug_continue.png} | Bin
 .../icons/{debug_next.png => pyzo_debug_next.png}  | Bin
 .../icons/{debug_quit.png => pyzo_debug_quit.png}  | Bin
 .../{debug_return.png => pyzo_debug_return.png}    | Bin
 .../icons/{debug_step.png => pyzo_debug_step.png}  | Bin
 .../icons/{disk_as.png => pyzo_disk_as.png}        | Bin
 .../icons/{filter.png => pyzo_filter.png}          | Bin
 .../icons/{folder_hg.png => pyzo_folder_hg.png}    | Bin
 .../{folder_parent.png => pyzo_folder_parent.png}  | Bin
 .../icons/{folder_svn.png => pyzo_folder_svn.png}  | Bin
 .../{overlay_disk.png => pyzo_overlay_disk.png}    | Bin
 .../icons/{overlay_hg.png => pyzo_overlay_hg.png}  | Bin
 .../{overlay_link.png => pyzo_overlay_link.png}    | Bin
 .../{overlay_star.png => pyzo_overlay_star.png}    | Bin
 .../{overlay_svn.png => pyzo_overlay_svn.png}      | Bin
 ...ay_thumbnail.png => pyzo_overlay_thumbnail.png} | Bin
 ...age_delete_all.png => pyzo_page_delete_all.png} | Bin
 .../icons/{page_white.png => pyzo_page_white.png}  | Bin
 ...e_white_dirty.png => pyzo_page_white_dirty.png} | Bin
 .../{page_white_py.png => pyzo_page_white_py.png}  | Bin
 ...{page_white_pyx.png => pyzo_page_white_pyx.png} | Bin
 ...{plugin_refresh.png => pyzo_plugin_refresh.png} | Bin
 .../icons/{run_cell.png => pyzo_run_cell.png}      | Bin
 .../icons/{run_file.png => pyzo_run_file.png}      | Bin
 ...un_file_script.png => pyzo_run_file_script.png} | Bin
 .../icons/{run_lines.png => pyzo_run_lines.png}    | Bin
 .../{run_mainfile.png => pyzo_run_mainfile.png}    | Bin
 ...ile_script.png => pyzo_run_mainfile_script.png} | Bin
 pyzo/resources/icons/{star2.png => pyzo_star2.png} | Bin
 pyzo/resources/icons/{star3.png => pyzo_star3.png} | Bin
 pyzo/resources/pyzo.desktop                        |  14 ++
 pyzo/resources/translations/pyzo_zh_TW.tr          |   4 +-
 pyzo/tools/pyzoFileBrowser/proxies.py              |   2 +-
 pyzo/tools/pyzoFileBrowser/tree.py                 |  10 +-
 pyzo/tools/pyzoWorkspace.py                        |   6 +-
 pyzo/yoton/channels/channels_file.py               |   8 +-
 55 files changed, 317 insertions(+), 115 deletions(-)

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