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

This commit is contained in:
Joey Hess 2013-01-10 16:43:48 -04:00
commit 0eb2841544
3 changed files with 25 additions and 1 deletions

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.154.7.238"
subject="been a while.."
date="2013-01-10T20:19:33Z"
content="""
Think I have it now.
"""]]

View file

@ -0,0 +1,16 @@
[[!comment format=mdwn
username="http://nullroute.eu.org/~grawity/"
nickname="Mantas"
subject="build failure"
date="2013-01-10T20:24:09Z"
content="""
<pre>
$ cabal build
Building git-annex-3.20130108...
Preprocessing executable 'git-annex' for git-annex-3.20130108...
[269 of 299] Compiling Assistant.Threads.MountWatcher ( Assistant/Threads/MountWatcher.hs,
dist/build/git-annex/git-annex-tmp/Assistant/Threads/MountWatcher.o )
Assistant/Threads/MountWatcher.hs:122:17: Not in scope: `gvfs'
</pre>
"""]]

View file

@ -8,6 +8,6 @@ assistant, please instead fill in this poll on behalf of less technically
adept friends or family -- what's preventing you from introducing them to
the assistant?
[[!poll open=yes expandable=yes 0 "I'm using the assistant!" 0 "I need a Windows port" 1 "I need an Android port" 0 "I need an IPhone port (not holding my breath)" 0 "Well, it's still in beta..." 1 "I want to, but have not had the time to try it" 0 "Just inertia. I've got this dropbox/whatever that already works.." 0 "It's too hard to install (please say why in comments)" 1 "Perceived recent increase of bug reports and thus sitting it out."]]
[[!poll open=yes expandable=yes 0 "I'm using the assistant!" 0 "I need a Windows port" 2 "I need an Android port" 0 "I need an IPhone port (not holding my breath)" 0 "Well, it's still in beta..." 1 "I want to, but have not had the time to try it" 0 "Just inertia. I've got this dropbox/whatever that already works.." 0 "It's too hard to install (please say why in comments)" 1 "Perceived recent increase of bug reports and thus sitting it out." 1 "Initially the lack of direct-mode. Now concerns about the safety of direct mode. Perhaps after the next release."]]
Feel free to write in your own reasons, or add a comment to give me more info.