summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-04-08 15:35:55 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-04-08 15:35:55 -0400
commit33b26b3b72097e8bf48a53c75bc952fc2d18f8a8 (patch)
tree92a5bcb07a8ca17bf56615da90bd079aff1c7af0
parent02e813d4417659ffe50f50672cc6aef9196412e6 (diff)
parent3e5af8ce6bd7bd5aee1731a19a9613b1c6c92bcb (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
-rw-r--r--doc/bugs/easy_feature_request__58___enable_lan_sync_on_android.mdwn1
-rw-r--r--doc/todo/Compile_error_with_GHC_prerelease.mdwn14
2 files changed, 15 insertions, 0 deletions
diff --git a/doc/bugs/easy_feature_request__58___enable_lan_sync_on_android.mdwn b/doc/bugs/easy_feature_request__58___enable_lan_sync_on_android.mdwn
new file mode 100644
index 000000000..938e7c68b
--- /dev/null
+++ b/doc/bugs/easy_feature_request__58___enable_lan_sync_on_android.mdwn
@@ -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.
diff --git a/doc/todo/Compile_error_with_GHC_prerelease.mdwn b/doc/todo/Compile_error_with_GHC_prerelease.mdwn
new file mode 100644
index 000000000..e8f930ad2
--- /dev/null
+++ b/doc/todo/Compile_error_with_GHC_prerelease.mdwn
@@ -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