[Pkg-owncloud-commits] [owncloud-client] 23/470: Merge remote-tracking branch 'origin/2.1'

[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 93308faeb9a8fc4a1198673b0ce48b64d2d934ac
Merge: 16ab3ca f140d34
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Mon Feb 8 14:28:25 2016 +0100

    Merge remote-tracking branch 'origin/2.1'
    
     Conflicts:
    	doc/building.rst

 .gitignore                                     |   1 -
 ChangeLog                                      |   3 +-
 admin/osx/macdeployqt.py                       |   4 +-
 admin/win/docker/Dockerfile                    |  37 +++++++++
 admin/win/docker/build.sh                      |  18 ++--
 admin/win/nsi/l10n/bin/build_locale_nsi.py     |   2 +-
 csync/src/csync_update.c                       |  55 +++++++++++--
 doc/building.rst                               | 109 ++++++++++++-------------
 doc/conf.py.in                                 |   2 +
 doc/ocdoc                                      |   2 +-
 shell_integration/nautilus/createnemoplugin.sh |   6 ++
 src/gui/folderwatcher_mac.cpp                  |   2 +-
 src/libsync/CMakeLists.txt                     |   7 +-
 src/libsync/accessmanager.cpp                  |   4 -
 src/libsync/creds/httpcredentials.cpp          |   1 -
 src/libsync/creds/tokencredentials.cpp         |   8 +-
 src/libsync/creds/tokencredentials.h           |   3 +-
 src/libsync/discoveryphase.cpp                 |   3 -
 translations/client_de.ts                      |   2 +-
 translations/client_fr.ts                      |  10 +--
 translations/client_ja.ts                      |   4 +-
 translations/client_ru.ts                      |   2 +-
 22 files changed, 187 insertions(+), 98 deletions(-)

diff --cc doc/building.rst
index 112f92a,0cfd0ec..465efc0
--- a/doc/building.rst
+++ b/doc/building.rst
@@@ -195,10 -193,9 +193,10 @@@ To build the most up to date version o
  
  1. Clone the latest versions of the client from Git_ as follows::
  
-     git clone git://github.com/owncloud/client.git
-     cd client
-     git submodule init
-     git submodule update
+      git clone git://github.com/owncloud/client.git
++     cd client
+      git submodule init
+      git submodule update
  
  2. Create the build directory::
  
@@@ -207,14 -204,14 +205,14 @@@
  
  3. Configure the client build::
  
 -     cmake -DCMAKE_BUILD_TYPE="Debug" ../client
 +    cmake -DCMAKE_BUILD_TYPE="Debug" ..
  
-   .. note:: You must use absolute paths for the ``include`` and ``library``
-            directories.
+    .. note:: You must use absolute paths for the ``include`` and ``library``
+             directories.
  
-   .. note:: On Mac OS X, you need to specify ``-DCMAKE_INSTALL_PREFIX=target``,
-            where ``target`` is a private location, i.e. in parallel to your build
-            dir by specifying ``../install``.
+    .. note:: On Mac OS X, you need to specify ``-DCMAKE_INSTALL_PREFIX=target``,
+             where ``target`` is a private location, i.e. in parallel to your build
+             dir by specifying ``../install``.
  
  4. Call ``make``.
  

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