diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-02-17 16:15:00 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-02-17 16:15:00 -0400 |
| commit | 0bdaad9e26f9c25add31dbfb3afd8b61114500d9 (patch) | |
| tree | 92ee2ea4b918a7d7a1a0051b06988ae9f1dc3c4e /debian | |
| parent | c18aca6a6a1673d17467e25eb5c900f824c8231c (diff) | |
| parent | baab4c2023c7bce2d4c5d7f8799e28ac59dd4583 (diff) | |
Merge branch 'master' into database
Conflicts:
debian/changelog
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 795c0149e..eda5d833b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,7 @@ git-annex (5.20150206) UNRELEASED; urgency=medium * sync, assistant: Use the ssh-options git config when doing git pull and push. * remotedaemon: Use the ssh-options git config. + * Linux standalone: Improved process names of linker shimmed programs. * fsck: Incremental fsck uses sqlite to store its records, instead of abusing the sticky bit. Existing sticky bits are ignored, incremental fscks started by old versions won't be resumed by |