diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-08-27 13:31:54 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-08-27 13:31:54 -0400 |
| commit | b12db9ef9214d801280310222fc5e9d16f8af3de (patch) | |
| tree | 161aea0e484d014ddc1d1c8430037829debdbb5d /debian | |
| parent | 347d3892e7b7897f696268a162e8638b12612f31 (diff) | |
| parent | d228e4ca8c5b9ed88fe6b30ada12e822f847f58d (diff) | |
Merge branch 'master' into assistant
Conflicts:
debian/changelog
Updated changelog for assistant and webapp
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 9f62d38da..5f514166f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,22 @@ -git-annex (3.20120808) UNRELEASED; urgency=low +git-annex (3.20120826) UNRELEASED; urgency=low - * S3: Add fileprefix setting. - * Pass --use-agent to gpg when in no tty mode. Thanks, Eskild Hustvedt. + * assistant: New command, a daemon which does everything watch does, + as well as automatically syncing file contents between repositories. + * webapp: New command (and FreeDesktop menu item) that allows managing + and configuring the assistant in a web browser. * init: If no description is provided for a new repository, one will automatically be generated, like "joey@gnu:~/foo" + + -- Joey Hess <joeyh@debian.org> Mon, 27 Aug 2012 13:27:39 -0400 + +git-annex (3.20120825) unstable; urgency=low + + * S3: Add fileprefix setting. + * Pass --use-agent to gpg when in no tty mode. Thanks, Eskild Hustvedt. * Bugfix: Fix fsck in SHA*E backends, when the key contains composite extensions, as added in 3.20120721. - -- Joey Hess <joeyh@debian.org> Thu, 09 Aug 2012 13:51:47 -0400 + -- Joey Hess <joeyh@debian.org> Sat, 25 Aug 2012 10:00:10 -0400 git-annex (3.20120807) unstable; urgency=low |