[Pkg-owncloud-commits] [owncloud-client] 31/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 beb9752f09a426163cf0b12e544d0698e24eb313
Merge: 93f31fa 1eb6e16
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Wed Feb 12 21:17:06 2014 +0100

    Merge remote-tracking branch 'origin/1.5'

 OWNCLOUD.cmake                  |  2 +-
 VERSION.cmake                   |  2 +-
 cmake/modules/NSIS.template.in  | 46 +++++++++++++++---------
 config.h.in                     |  2 ++
 doc/autoupdate.rst              | 79 +++++++++++++++++++++++++++++++++++++++++
 doc/index.rst                   |  1 +
 src/mirall/account.cpp          |  8 +++--
 src/mirall/application.cpp      | 10 ++++--
 src/mirall/mirallconfigfile.cpp | 58 +++++++++++++++++++++++++-----
 src/mirall/mirallconfigfile.h   |  2 ++
 src/mirall/sslbutton.cpp        |  7 ++--
 src/mirall/utility.cpp          |  1 -
 12 files changed, 184 insertions(+), 34 deletions(-)

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