diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2014-02-27 14:40:34 +0400 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2014-02-27 14:40:34 +0400 |
| commit | 869793592d0bb1426a5a2c121ffd3880a2f1d62e (patch) | |
| tree | 53fa772daadc87bb14fe9a5e1e61170ce1e523f6 /doc | |
| parent | 417dbcc9ac8881bf31088a8ea7524c2aea2db40c (diff) | |
| parent | 02bfb4f0054bf8be7cb9380697f6d2350ae365d3 (diff) | |
Merge branch '1.5'
Conflicts:
VERSION.cmake
src/mirall/owncloudpropagator.cpp
src/mirall/owncloudpropagator.h
Diffstat (limited to 'doc')
| -rwxr-xr-x | doc/scripts/htmlhelp.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/doc/scripts/htmlhelp.sh b/doc/scripts/htmlhelp.sh index ea6e9d1bc..b2cba7d87 100755 --- a/doc/scripts/htmlhelp.sh +++ b/doc/scripts/htmlhelp.sh @@ -1,4 +1,17 @@ #!/bin/sh +# +# Copyright (C) by Daniel Molkentin <danimo@owncloud.com> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# + WINEPREFIX=${WINEPREFIX:=$HOME/.wine} |