[Pkg-owncloud-commits] [owncloud-client] 54/333: Merge remote-tracking branch 'origin/1.5'

[Sandro Knauß]

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

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

commit 2de288c5f3cfdb88ef05d779f61aa30b768b9f87
Merge: fcc0e89 e4965ab
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Wed Feb 19 10:21:23 2014 +0100

    Merge remote-tracking branch 'origin/1.5'
    
    Conflicts:
    	VERSION.cmake

 ChangeLog                                          |  35 +++++
 ...eny_autoupdate_com.owncloud.desktopclient.plist | Bin 0 -> 65 bytes
 doc/accountsetup.rst                               |  28 ++--
 doc/architecture.rst                               |   2 +-
 doc/autoupdate.rst                                 |  12 +-
 doc/images/folderwizard_local.png                  | Bin 0 -> 73614 bytes
 doc/images/folderwizard_remote.png                 | Bin 0 -> 55791 bytes
 doc/images/icon.png                                | Bin 1290 -> 1301 bytes
 doc/images/ignored_files_editor.png                | Bin 49080 -> 107117 bytes
 doc/images/menu.png                                | Bin 18110 -> 40563 bytes
 doc/images/settings_activity.png                   | Bin 0 -> 336801 bytes
 doc/images/settings_general.png                    | Bin 50908 -> 97877 bytes
 doc/images/settings_network.png                    | Bin 60526 -> 113591 bytes
 doc/images/sync_protocol.png                       | Bin 171942 -> 0 bytes
 doc/images/wizard_targetfolder.png                 | Bin 39694 -> 92661 bytes
 doc/images/wizard_url.png                          | Bin 40236 -> 74341 bytes
 doc/images/wizard_user.png                         | Bin 38342 -> 75305 bytes
 doc/introduction.rst                               |  25 ++-
 doc/options.rst                                    |   8 +-
 doc/visualtour.rst                                 | 175 +++++++++++++--------
 src/CMakeLists.txt                                 |   2 +
 src/mirall/folderwatcher_mac.cpp                   |   2 +-
 src/mirall/mirallconfigfile.cpp                    |   2 +-
 src/mirall/theme.cpp                               |   8 +-
 src/mirall/utility.cpp                             |   6 +
 25 files changed, 201 insertions(+), 104 deletions(-)

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