summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-05-25 15:24:35 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-05-25 15:24:35 -0400
commit20fec383954b45026b3880ee89ccc755d75fdbfe (patch)
tree225c6b9915295e9fe5ee65e6c810029083b0ef40
parent770ab040c32ff0f75c54e1975bf784b116c8d584 (diff)
parent02e23cfd4f53332b116a4f55b440aea822df2f84 (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
-rw-r--r--doc/install/OSX.mdwn1
-rw-r--r--doc/todo/Build_for_Synology_DSM/comment_7_19ef2d293ba3bc7ece443d7278371c3f._comment8
2 files changed, 9 insertions, 0 deletions
diff --git a/doc/install/OSX.mdwn b/doc/install/OSX.mdwn
index a70074f38..fec346710 100644
--- a/doc/install/OSX.mdwn
+++ b/doc/install/OSX.mdwn
@@ -40,6 +40,7 @@ brew install haskell-platform git ossp-uuid md5sha1sum coreutils libgsasl gnutls
brew link libxml2
cabal update
PATH=$HOME/bin:$PATH
+cabal install gnuidn
cabal install c2hs git-annex --bindir=$HOME/bin
</pre>
diff --git a/doc/todo/Build_for_Synology_DSM/comment_7_19ef2d293ba3bc7ece443d7278371c3f._comment b/doc/todo/Build_for_Synology_DSM/comment_7_19ef2d293ba3bc7ece443d7278371c3f._comment
new file mode 100644
index 000000000..47d092331
--- /dev/null
+++ b/doc/todo/Build_for_Synology_DSM/comment_7_19ef2d293ba3bc7ece443d7278371c3f._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkwjBDXkP9HAQKhjTgThGOxUa1B99y_WRA"
+ nickname="Franck"
+ subject="comment 7"
+ date="2013-05-25T19:01:29Z"
+ content="""
+This is indeed what I'm doing. But I need to make a wrapper that will call the command in the chroot. Thanks for the tip anyway. :-)
+"""]]