[Pkg-owncloud-commits] [owncloud-client] 147/332: Merge remote-tracking branch 'origin/1.6'

[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 f8b097669aa5bf651b3a2749190d958a9a79a07f
Merge: e7d5970 40d765c
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Fri Jun 27 15:34:20 2014 +0200

    Merge remote-tracking branch 'origin/1.6'
    
    Conflicts:
    	VERSION.cmake
    	doc/building.rst

 doc/accountsetup.rst                               |  41 ++-
 doc/architecture.rst                               | 263 ++++++++---------
 doc/autoupdate.rst                                 | 139 +++++----
 doc/building.rst                                   | 176 ++++++------
 doc/conffile.rst                                   |  24 +-
 doc/faq.rst                                        |  17 +-
 doc/images/client_setup_wizard_components.png      | Bin 0 -> 35196 bytes
 doc/images/client_setup_wizard_install_finish.png  | Bin 0 -> 21141 bytes
 .../client_setup_wizard_install_progress.png       | Bin 0 -> 19726 bytes
 doc/images/client_setup_wizard_location.png        | Bin 0 -> 30498 bytes
 doc/images/client_setup_wizard_main.png            | Bin 0 -> 25868 bytes
 doc/images/client_setup_wizard_reinstall.png       | Bin 0 -> 33624 bytes
 doc/images/client_setup_wizard_uninstall.png       | Bin 0 -> 33621 bytes
 doc/images/client_setup_wizard_uninstall_2.png     | Bin 0 -> 29159 bytes
 doc/images/client_setup_wizard_uninstall_3.png     | Bin 0 -> 31134 bytes
 doc/images/download_button.png                     | Bin 0 -> 1163 bytes
 doc/images/log_output_window.png                   | Bin 0 -> 43946 bytes
 doc/images/oc_client_download_options.png          | Bin 0 -> 7171 bytes
 doc/images/oc_client_linux_download.png            | Bin 0 -> 35366 bytes
 doc/images/oc_client_macosx_download.png           | Bin 0 -> 33779 bytes
 doc/images/oc_client_windows_download.png          | Bin 0 -> 24779 bytes
 doc/images/oc_client_windows_option.png            | Bin 0 -> 1689 bytes
 doc/images/oc_connection_wizard_credentials.png    | Bin 0 -> 33007 bytes
 doc/images/oc_connection_wizard_finish.png         | Bin 0 -> 40657 bytes
 doc/images/oc_connection_wizard_localfolder.png    | Bin 0 -> 37287 bytes
 doc/images/oc_connection_wizard_server.png         | Bin 0 -> 32433 bytes
 doc/images/oc_website.png                          | Bin 0 -> 72353 bytes
 doc/images/owncloud_logo_transparent.png           | Bin 0 -> 47374 bytes
 doc/images/owncloud_small_wh_bl.jpg                | Bin 0 -> 11741 bytes
 doc/images/save_log_file.png                       | Bin 0 -> 68034 bytes
 doc/images/security_warning_windows.png            | Bin 0 -> 13093 bytes
 doc/index.rst                                      |   5 +-
 doc/installing-linux.rst                           | 208 ++++++++++++++
 doc/installing-macosx.rst                          |   4 +
 doc/installing-windows.rst                         | 102 +++++++
 doc/installing.rst                                 |  13 +
 doc/introduction.rst                               |  34 +--
 doc/logo-blue.pdf                                  | Bin 1851 -> 1849 bytes
 doc/navigating.rst                                 | 313 +++++++++++++++++++++
 doc/options.rst                                    |  15 +-
 doc/owncloud.1.rst                                 |   8 +-
 doc/owncloudcmd.1.rst                              |  28 +-
 doc/owncloudcmd.rst                                |  57 ++--
 doc/troubleshooting.rst                            | 269 +++++++++++-------
 src/creds/shibboleth/shibbolethuserjob.h           |   4 +-
 src/creds/shibbolethcredentials.cpp                |  17 ++
 src/creds/shibbolethcredentials.h                  |   3 +
 src/wizard/owncloudshibbolethcredspage.cpp         |  10 +-
 src/wizard/owncloudshibbolethcredspage.h           |   3 +-
 49 files changed, 1264 insertions(+), 489 deletions(-)

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