diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-25 16:44:37 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-25 16:44:37 -0400 |
| commit | 14015036bce2d6a4cf57775ccfc5310f0ec96082 (patch) | |
| tree | f606b43cd8fd86c5859ada4b98bc4f678f2ffd70 /debian | |
| parent | 5cfe91f06d5eaab217f1b289810d96fee0144c31 (diff) | |
| parent | cede7bdcdee25adcc635a0496ece6d7078a094d5 (diff) | |
Merge branch 'master' into assistant
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index a580f88bc..2c289667d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,10 @@ -git-annex (3.20120616) UNRELEASED; urgency=low +git-annex (3.20120625) UNRELEASED; urgency=low + + * cabal: Only try to use inotify on Linux. + + -- Joey Hess <joeyh@debian.org> Mon, 25 Jun 2012 11:38:12 -0400 + +git-annex (3.20120624) unstable; urgency=low * watch: New subcommand, a daemon which notices changes to files and automatically annexes new files, etc, so you don't @@ -8,7 +14,7 @@ git-annex (3.20120616) UNRELEASED; urgency=low * unused: Fix crash when key names contain invalid utf8. * sync: Avoid recent git's interactive merge. - -- Joey Hess <joeyh@debian.org> Tue, 12 Jun 2012 11:35:59 -0400 + -- Joey Hess <joeyh@debian.org> Sun, 24 Jun 2012 12:36:50 -0400 git-annex (3.20120614) unstable; urgency=medium |