[Xfce4-commits] [xfce/exo] 18/21: Merge remote-tracking branch 'exo-gtk3/master'

[noreply at xfce.org]

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

bluesabre pushed a commit to branch master
in repository xfce/exo.

commit 54395b6613894651978618c6fe94ec40ab33f1d8
Merge: 85d6526 915b9e8
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Mon Jun 6 21:27:24 2016 -0400

    Merge remote-tracking branch 'exo-gtk3/master'

 configure.ac.in                               |   10 +-
 exo-desktop-item-edit/Makefile.am             |   12 +-
 exo-desktop-item-edit/exo-die-command-entry.c |   16 +-
 exo-desktop-item-edit/exo-die-command-model.c |    6 +-
 exo-desktop-item-edit/exo-die-desktop-model.c |    6 +-
 exo-desktop-item-edit/exo-die-editor.c        |   88 +-
 exo-desktop-item-edit/main.c                  |   31 +-
 exo-helper/Makefile.am                        |   12 +-
 exo-helper/exo-helper-chooser-dialog.c        |   38 +-
 exo-helper/exo-helper-chooser.c               |  114 +--
 exo-helper/exo-helper-launcher-dialog.c       |   16 +-
 exo-helper/exo-helper.c                       |   11 +-
 exo-helper/main.c                             |   11 +-
 exo-open/Makefile.am                          |    6 +-
 exo/Makefile.am                               |   29 +-
 exo/exo-cell-renderer-ellipsized-text.c       |   18 +-
 exo/exo-cell-renderer-icon.c                  |  105 ++-
 exo/exo-execute.c                             |   19 +-
 exo/exo-gtk-extensions.c                      |   15 +
 exo/exo-gtk-extensions.h                      |    4 +
 exo/exo-icon-bar.c                            |   90 ++-
 exo/exo-icon-chooser-dialog.c                 |   60 +-
 exo/exo-icon-chooser-model.c                  |    7 +
 exo/exo-icon-view-accessible.c                |   39 +-
 exo/exo-icon-view.c                           | 1058 +++++++++++++++++++------
 exo/exo-icon-view.h                           |    5 +
 exo/exo-thumbnail-preview.c                   |   27 +-
 exo/exo-toolbars-editor-dialog.c              |    7 +-
 exo/exo-toolbars-editor.c                     |    2 +-
 exo/exo-toolbars-private.c                    |   22 +-
 exo/exo-toolbars-view.c                       |   21 +-
 exo/exo-tree-view.c                           |   14 +-
 exo/exo-wrap-table.c                          |   36 +-
 exo/exo.h                                     |   21 +-
 34 files changed, 1387 insertions(+), 589 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.