diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-06-30 14:55:36 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-06-30 15:01:08 -0400 |
| commit | ee3a0551a78534ede078f8340a6f075245815914 (patch) | |
| tree | 6fb64ea837927c70b6cf4109104dea4cfe110d7d /debian | |
| parent | 896726cde425f6c74273b35cde30c1909551ff66 (diff) | |
| parent | 56aeeb4565dd419c315d370f6e648abfe009a7d3 (diff) | |
Merge branch 'master' into v3
Conflicts:
debian/changelog
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 9013abd13..f3cbbef9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,10 @@ git-annex (3.20110625) UNRELEASED; urgency=low * --force will cause add, etc, to operate on ignored files. * Avoid mangling encoding when storing the description of repository and other content. + * cabal can now be used to build git-annex. This is substantially + slower than using make, does not build or install documentation, + does not run the test suite, and is not particularly recommended, + but could be useful to some. -- Joey Hess <joeyh@debian.org> Sun, 26 Jun 2011 21:01:06 -0400 |