[Pkg-owncloud-commits] [owncloud-client] 03/171: Merge pull request #4247 from owncloud/desktopshare

[Sandro Knauß]

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

hefee-guest pushed a commit to annotated tag upstream/2.1.1+dfsg
in repository owncloud-client.

commit 4d175ae77b2e866e2e438f9e3fbfc67a850e29d0
Merge: 68057c1 78df3a3
Author: Daniel Molkentin <daniel at molkentin.de>
Date:   Thu Dec 3 20:19:47 2015 +0100

    Merge pull request #4247 from owncloud/desktopshare
    
    added desktop sharing

 doc/autoupdate.rst       |   3 +--
 doc/images/mac-share.png | Bin 0 -> 59496 bytes
 doc/images/share-1.png   | Bin 0 -> 18267 bytes
 doc/images/share-2.png   | Bin 0 -> 24573 bytes
 doc/introduction.rst     |  36 ++++---------------------
 doc/navigating.rst       |  68 ++++++++++++++++++++++++++++++++++-------------
 6 files changed, 55 insertions(+), 52 deletions(-)

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