[Xfce4-commits] [thunar-plugins/thunar-shares-plugin] 01/01: Merge branch 'thunarx-2'

[noreply at xfce.org]

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

danielm pushed a commit to branch master
in repository thunar-plugins/thunar-shares-plugin.

commit 0617bba7021fb6f72f81d3efe4d48a90afc10ccc
Merge: 1925213 2a4c0bf
Author: Daniel Morales <daniel at daniel.com.uy>
Date:   Tue Sep 23 10:02:32 2014 -0300

    Merge branch 'thunarx-2'
    
    No need to keep a different branch when master it's broken

 .gitignore                           |   38 +++++++++++++++++
 configure.in.in                      |   75 +++++++---------------------------
 libshares/Makefile.am                |    4 +-
 libshares/libshares-util.c           |   30 +++++++++-----
 libshares/shares.c                   |    2 +-
 thunar-plugin/Makefile.am            |    6 +--
 thunar-plugin/thunar-shares-plugin.c |    5 +++
 thunar-plugin/tsp-page.c             |    2 -
 thunar-plugin/tsp-provider.c         |    2 -
 9 files changed, 80 insertions(+), 84 deletions(-)

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