diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-08-16 16:36:32 -0700 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-08-16 16:36:32 -0700 |
| commit | cbca93cf7cdecc7fd2a66c4640da246462ecc7c7 (patch) | |
| tree | a2b03b8661a660417c93c75e88a41114c427b7b7 /debian | |
| parent | e89c7d3e6af69786458e885fe900c063e2d2af6a (diff) | |
| parent | 1da4513f4d8c713f167b8e463d7703da5ac2d6a7 (diff) | |
Merge branch 'master' into assistant
Conflicts:
debian/changelog
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 5fcd82626..a5a1f1134 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ git-annex (3.20120808) UNRELEASED; urgency=low + * S3: Add fileprefix setting. * init: If no description is provided for a new repository, one will automatically be generated, like "joey@gnu:~/foo" - -- Joey Hess <joeyh@debian.org> Tue, 07 Aug 2012 13:35:07 -0400 + -- Joey Hess <joeyh@debian.org> Thu, 09 Aug 2012 13:51:47 -0400 git-annex (3.20120807) unstable; urgency=low |