diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-05-15 19:18:04 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-15 19:18:04 -0400 |
| commit | 9faa6f0e33dd9e8c7ec3b96715ea3878ff9ef2f0 (patch) | |
| tree | 3bde05906addb27cb565d67b05bf686945ee235a /debian | |
| parent | 8986a918e5af331db29b953e061dc2d20a5b86d2 (diff) | |
| parent | a243fb1c7f04817fa19209689849aa2fe8631b3d (diff) | |
Merge branch 'master' into windows
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/menu | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 6b94c4559..43c7de59e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ git-annex (4.20130502) UNRELEASED; urgency=low * git-annex-shell: Ensure that received files can be read. Files transferred from some Android devices may have very broken permissions as received. + * direct mode: Direct mode commands now work on files staged in the index, + they do not need to be committed to git. * Temporarily add an upper bound to the version of yesod that can be built with, since yesod 1.2 has a great many changes that will require extensive work on the webapp. @@ -24,6 +26,7 @@ git-annex (4.20130502) UNRELEASED; urgency=low the destination's default file permissions, as the local ones can be arbitrarily broken. (Ie, ----rwxr-x for files on Android) * migrate: Detect if a file gets corrupted while it's being migrated. + * Debian: Add a menu file. -- Joey Hess <joeyh@debian.org> Thu, 02 May 2013 20:39:19 -0400 diff --git a/debian/menu b/debian/menu new file mode 100644 index 000000000..59ae5041e --- /dev/null +++ b/debian/menu @@ -0,0 +1,2 @@ +?package(git-annex):needs="X11" section="Applications/Network" \ + title="git-annex assistant" command="git annex webapp" |