[Pkg-owncloud-commits] [ocsync] 15/29: Merge tag 'upstream/0.91.2'

[Sandro Knauß]

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

hefee-guest pushed a commit to branch master
in repository ocsync.

commit f560b8025d2a902c341368eb67f184bd0bc616b7
Merge: f9a36da d13e299
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Wed Dec 11 14:26:54 2013 +0100

    Merge tag 'upstream/0.91.2'
    
    Upstream version 0.91.2
    
    # gpg: Unterschrift vom Mi 11 Dez 2013 14:26:39 CET mittels RSA-Schlüssel ID 50605636
    # gpg: Korrekte Unterschrift von "Sandro Knauß <bugs at sandroknauss.de>"

 .tag                      |  2 +-
 CMakeLists.txt            |  2 +-
 src/csync.c               |  3 +--
 src/csync.h               |  9 ++++++---
 src/csync_exclude.c       |  8 +-------
 src/csync_owncloud_util.c |  4 +++-
 src/csync_private.h       |  2 +-
 src/csync_statedb.c       |  2 +-
 src/csync_statedb.h       |  2 +-
 src/csync_update.c        | 12 ++++++++----
 src/std/c_file.c          | 31 +++++++++++++++++++++++++++++++
 src/std/c_file.h          | 14 +++++++++++++-
 src/vio/csync_vio_local.c |  5 +++++
 tests/ownCloud/t3.pl      | 21 ++++++++++++++++++---
 14 files changed, 91 insertions(+), 26 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/ocsync.git