[Xfce4-commits] [xfce/thunar] 04/04: Merge branch 'master' of https://github.com/andreldm/thunar

[noreply at xfce.org]

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

andrzejr pushed a commit to branch master
in repository xfce/thunar.

commit f96608c72346fb59567ff568c43f8c3867311fad
Merge: 5a623a5 9e9da20
Author: Andrzej <ndrwrdck at gmail.com>
Date:   Sat Dec 20 00:21:57 2014 +0000

    Merge branch 'master' of https://github.com/andreldm/thunar

 thunar/thunar-dialogs.c            |    6 +-
 thunar/thunar-file.c               |   23 +++
 thunar/thunar-file.h               |  280 ++++++++++++++++++------------------
 thunar/thunar-gio-extensions.c     |   21 ++-
 thunar/thunar-list-model.c         |   91 +++++++++++-
 thunar/thunar-preferences-dialog.c |    8 +-
 thunar/thunar-preferences.c        |   13 ++
 thunar/thunar-size-label.c         |   31 ++--
 thunar/thunar-standard-view.c      |    1 +
 thunar/thunar-transfer-job.c       |   47 +++---
 10 files changed, 340 insertions(+), 181 deletions(-)

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