mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Joey Hess 2012-09-26 19:01:09 -04:00
commit 7010e7cdf6
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
doc/bugs/cabal_configure_is_broken_on_OSX_builds.mdwn Normal file
View file

@ -0,0 +1,12 @@
Seems the last few commits have borked 'cabal configure' on OSX with the following error message
<pre>
[jtang@laplace git-annex (master)]$ cabal configure
Resolving dependencies...
Build/InstallDesktopFile.hs:19:8:
Could not find module `Assistant.OSX'
Use -v to see a list of the files searched for.
</pre>
Looks like a missing module.

2
doc/design/assistant/polls/prioritizing_special_remotes.mdwn
View file

@ -6,7 +6,7 @@ locally paired systems, and remote servers with rsync.
Help me prioritize my work: What special remote would you most like Help me prioritize my work: What special remote would you most like
to use with the git-annex assistant? to use with the git-annex assistant?
[[!poll open=yes 14 "Amazon S3 (done)" 8 "Amazon Glacier" 6 "Box.com" 44 "My phone (or MP3 player)" 6 "Tahoe-LAFS" 3 "OpenStack SWIFT" 12 "Google Drive"]] [[!poll open=yes 14 "Amazon S3 (done)" 8 "Amazon Glacier" 6 "Box.com" 46 "My phone (or MP3 player)" 6 "Tahoe-LAFS" 3 "OpenStack SWIFT" 12 "Google Drive"]]
This poll is ordered with the options I consider easiest to build This poll is ordered with the options I consider easiest to build
listed first. Mostly because git-annex already supports them and they listed first. Mostly because git-annex already supports them and they