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

This commit is contained in:
Joey Hess 2016-04-08 15:35:55 -04:00
commit c4be17d159
Failed to extract signature
2 changed files with 15 additions and 0 deletions

View file

@ -0,0 +1 @@
It would be nice to allow LAN sync on the android client. This would allow for easily syncing files when in an out-of-service area, or rapidly syncing to a device with a better network connection.

View file

@ -0,0 +1,14 @@
For various reasons we cannot use v8.0 (prereleases) yet,
but GHC v7.11.20150407
There was a compilation hiccup with polymorphic types. I corrected it in
https://github.com/ggreif/git-annex/tree/patch-1
The commit is
https://github.com/ggreif/git-annex/commit/a0ddad8d395b5eb61d1e7e6fdcbfa766c05de3d4
Cheers,
Gabor