Merge branch 'master' of ssh://git-annex.branchable.com

This commit is contained in:
Joey Hess 2014-02-25 18:10:29 -04:00
commit 6272c10818
2 changed files with 2 additions and 2 deletions

View file

@ -4,7 +4,7 @@ option can now be told to match files that were in a repository at some
point in the past. For example, `git annex get --in=here@{yesterday}` will
get any files that have been dropped over the past day.
While git-annex's location tracking info is stored in git and so versioned,
While git-annex's location tracking info is stored in git and thus versioned,
very little of it makes use of past versions of the location tracking info
(only `git annex log`). I'm happy to have finally found a use for it!

View file

@ -1,4 +1,4 @@
More windows porting. Made the build completely -Wall safe on Windows.
More Windows porting. Made the build completely `-Wall` safe on Windows.
Fixed some DOS path separator bugs that were preventing WebDav from
working. Have now tested both box.com and Amazon S3 to be completely
working in the webapp on Windows.