mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
19793 commits 13 branches 442 tags 103 MiB
Commit graph

449 commits

Author SHA1 Message Date
http://joeyh.name/
1e6298fab5 Added a comment 2013-10-21 22:09:05 +00:00
RaspberryPie
fb7c132051 Added a comment: "Could not find module Crypto.Hash" error when building git-annex 2013-10-21 19:55:12 +00:00
http://alan.petitepomme.net/
6993a05030 Added a comment: dbus and homebrew 2013-10-20 17:25:05 +00:00
http://joeyh.name/
903f763f33 Added a comment 2013-10-19 15:31:45 +00:00
http://mebus.myopenid.com/
d545faa7c5 Added a comment 2013-10-19 15:09:34 +00:00
http://mebus.myopenid.com/
176c6f5431 Added a comment: Error on Fedora 19 2013-10-19 14:57:12 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkJafmCf-sg9_OM0pynFYM3AO4WCgJiaMI
ec1bb8ce99 Added a comment: installing on fc19 2013-10-18 21:05:56 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U
962682b335 Added a comment 2013-10-18 15:59:00 +00:00
http://alan.petitepomme.net/
a68c2a33be Added a comment: dbus support? 2013-10-18 08:24:13 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmK0703vNSIQsP1mGf-4MAPnsBZiSc6yVo
42f447171b Added a comment: adding ssh server 2013-10-16 16:37:16 +00:00
http://joeyh.name/
692df61599 Added a comment 2013-10-16 16:05:46 +00:00
http://joeyh.name/
ae7508af0e Added a comment 2013-10-16 15:14:54 +00:00
fmarier
cdc7f44785 Added a comment: Re: comment 10 2013-10-16 13:43:37 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkdiXn5s1wX2Zncy1S7_h-yPTv2gt0bmmY
ae9a1c2f79 Added a comment 2013-10-16 11:43:37 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U
09152fcbcd removed 2013-10-16 09:40:41 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U
fded637db5 Added a comment 2013-10-16 09:40:24 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U
df0e4d3e70 Added a comment 2013-10-16 09:25:05 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmK0703vNSIQsP1mGf-4MAPnsBZiSc6yVo
2361b497e2 Added a comment: What am I missing? 2013-10-15 21:54:07 +00:00
http://joeyh.name/
440c1053c2 Added a comment 2013-10-11 17:09:33 +00:00
Joey Hess
b988e2fd9f typo 2013-10-11 01:08:50 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlkA6XinbeOdnEDxEGQUWyjqPGh0kdMXr4
d4af2a6dee Added a comment: Updating git-annex via cabal 2013-10-09 21:21:22 +00:00
https://openid.stackexchange.com/user/2eeca722-8d1c-41fe-8fda-13af7eaff6ae
baa1a4d503 Added a comment: Outdated in 13.04 2013-10-08 16:36:12 +00:00
Joey Hess
6622875cf8 Revert "use vector in local status", which was not an improvement 
This reverts commit eb3ce3581a.
 2013-10-07 04:06:10 -04:00
Joey Hess
eb3ce3581a use vector in local status 
Thought was that this would be faster than a map, since a vector can be
updated more efficiently. It turns out to not seem to matter; runtime and
memory usage are basically identical.
 2013-10-07 04:05:14 -04:00
Joey Hess
20fb905bb6 allow building w/o cryptohash 
Mostly for the debian stable autobuilds, which have a too old version
to use the Crypto.Hash module.
 2013-10-03 12:33:38 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnyMzZZLS1xGW1raqc_9Md6Ksdkvx5rUJU
8f97bdecfe Added a comment: confusion with bundled programs 2013-10-02 21:39:11 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlu7K3h7Ry1uDAU_ERYGuqt0LoGNJqGuRo
3b3b6a3aeb Added a comment: Cabal installing git-annex on Ubuntu 12.04 Precise with GHC 7.6.3 2013-09-25 22:39:05 +00:00
http://id.clacke.se/
5cdb1e0d19 Added a comment: +1 F-Droid 2013-09-24 18:36:48 +00:00
Joey Hess
dcb9dead6f Merge branch 'master' into android-rebuild 2013-09-22 22:45:51 -04:00
Joey Hess
51cc760e06 working on getting make androidapp to work now 2013-09-22 22:23:08 -04:00
Joey Hess
d6c2fa5199 explicit cryptohash dep 2013-09-22 21:53:01 -04:00
Joey Hess
a9881b9d0b new buildchroot script to automate android chroot setup 2013-09-22 13:03:34 -04:00
foo
2889211efd refresh haskell package patches for new android build 
Android build is now almost entirely automated, except for the installation
of cross-built libs needed for XMPP.

Haskell packages updated to current newest versions. Am not currently
pinning the versions, as that didn't work out last time I tried it
(must have missed some pins before).
 2013-09-22 01:43:28 -04:00
http://joeyh.name/
2946b0802c Added a comment 2013-09-17 15:56:17 +00:00
Joey Hess
9bb8445213 Merge branch 'master' of ssh://git-annex.branchable.com 2013-09-16 16:48:13 -04:00
Joey Hess
b37aad6c06 webapp: Initial support for setting up encrypted removable drives. 
No support yet for generating new gpg keys.
No support yet for adding existing encrypted repos from removable drives.
 2013-09-16 16:07:27 -04:00
http://olivier.mehani.name/
b7e8ba4e73 Added a comment 2013-09-16 01:23:58 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmL8pteP2jbYJUn1M3CbeLDvz2SWAA1wtg
d1d72f5a7c Added a comment: Build failure using Haskel Platform 2013-09-15 18:49:01 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmL8pteP2jbYJUn1M3CbeLDvz2SWAA1wtg
1ae248997e removed 2013-09-15 18:46:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmL8pteP2jbYJUn1M3CbeLDvz2SWAA1wtg
2660dbb25f Added a comment: Build failure using Haskel Platform 2013-09-15 18:46:36 +00:00
Joey Hess
0dc38adce6 Merge branch 'master' of ssh://git-annex.branchable.com 2013-09-13 12:11:55 -04:00
Joey Hess
241c727197 add gcrypt (optional) 2013-09-13 12:07:34 -04:00
http://joeyh.name/
c9dbe2733a Added a comment 2013-09-13 15:35:59 +00:00
http://olivier.mehani.name/
498e94003c Added a comment: Stalling when creating repository in assistant 2013-09-13 05:09:51 +00:00
Joey Hess
60149d8ce3 Merge branch 'master' of ssh://git-annex.branchable.com 
Conflicts:
	doc/install/cabal.mdwn
 2013-09-12 17:45:54 -04:00
https://id.koumbit.net/anarcat
006bbdb36b removed 2013-09-12 21:17:57 +00:00
https://id.koumbit.net/anarcat
b31a83a0a9 update documentation install notice now that PREFIX works 2013-09-12 21:17:20 +00:00
Joey Hess
422cc2e892 remove 2013-09-12 17:14:55 -04:00
https://id.koumbit.net/anarcat
5e1ca97bb0 note how we can use make install to install documentation 2013-09-12 17:52:08 +00:00
Joey Hess
37581b84c7 credit 2013-09-11 13:19:57 -04:00
Joey Hess
238342117a Merge branch 'master' of ssh://git-annex.branchable.com 2013-09-11 12:10:11 -04:00
Joey Hess
960052bc36 credit for new autobuilder 2013-09-11 11:41:48 -04:00
https://id.koumbit.net/anarcat
af590215d1 Added a comment: manpages? 2013-09-10 05:00:50 +00:00
https://id.koumbit.net/anarcat
0e2879ce42 nevermind, that failed 2013-09-10 02:40:44 +00:00
https://id.koumbit.net/anarcat
0b60f8b810 share the results for my search for binary packages 2013-09-10 01:26:35 +00:00
http://openlifechallenge.wordpress.com/
d145641af9 Added a comment: Add to F-Droid 2013-09-08 09:56:39 +00:00
Joey Hess
431ea4a784 update 2013-09-06 13:25:25 -04:00
RaspberryPie
480ecb379c Added a comment: git-annex assistant for the Raspberry Pi 2013-09-04 03:58:37 +00:00
RaspberryPie
f1b14ef0ac Added a comment 2013-08-23 18:51:51 +00:00
http://joeyh.name/
552097c7aa Added a comment 2013-08-23 17:37:52 +00:00
RaspberryPie
0ae9373cf3 Added a comment: git-annex assistant on Arm 2013-08-23 03:07:11 +00:00
Joey Hess
46b6d75274 Youtube support! (And 53 other video hosts) 
When quvi is installed, git-annex addurl automatically uses it to detect
when an page is a video, and downloads the video file.

web special remote: Also support using quvi, for getting files,
or checking if files exist in the web.

This commit was sponsored by Mark Hepburn. Thanks!
 2013-08-22 18:50:43 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlfIVXjkzrYE9qJAO2A0H7K6tKGMaSgc3U
857be29b2a Added a comment: Problems with cryptocipher 2013-08-22 01:36:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk_GWOEjK4Sn4hUB6ofFlE3CNeC7tO56J8
46595f0ba3 Added a comment: Re: installed git-annex on debian but cannot find it 2013-08-20 00:50:28 +00:00
Miles
44ed493392 Added a comment: installed git-annex on debian but cannot find it 2013-08-19 23:29:24 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmrb8I1K5jjNr7ZrLSvgmkeQGjYauPeGJU
08fc432696 Added a comment 2013-08-18 16:44:03 +00:00
Joey Hess
74aa525444 wheezy backport now available 2013-08-16 15:56:12 +02:00
https://www.google.com/accounts/o8/id?id=AItOawlXEIT2PEAuHuInLP4UYVzWE0lceMYd2lA
06c8171f57 Added a comment: TonidoPlug 2013-08-09 17:46:28 +00:00
http://joeyh.name/
d8a259dfe4 Added a comment 2013-08-07 16:31:30 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlXEIT2PEAuHuInLP4UYVzWE0lceMYd2lA
3d25893744 Added a comment: Installation on tonidoplug 2013-08-03 07:19:55 +00:00
http://joeyh.name/
3bc7051210 Added a comment 2013-07-30 21:25:32 +00:00
Joey Hess
6cf2d1edbf Merge branch 'master' of ssh://git-annex.branchable.com 2013-07-30 17:14:19 -04:00
Joey Hess
147a9f8882 Improve test suite on Windows; now tests git annex sync. 2013-07-30 17:03:32 -04:00
http://mebus.pip.verisignlabs.com/
5dab99129f Added a comment 2013-07-30 20:41:07 +00:00
Antoine Beaupré
e59a8c64bd document explicitely how to install the haskell platform on Debian 2013-07-30 18:17:25 +02:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
9c1d340617 Added a comment 2013-07-30 15:02:51 +00:00
http://mebus.myopenid.com/
ecf4ba88a7 Added a comment: RPM of version 4.2 2013-07-30 01:09:54 +00:00
Joey Hess
6b97e3c259 Merge branch 'master' of ssh://git-annex.branchable.com 2013-07-28 16:58:26 -04:00
Joey Hess
7e66d260ea importfeed: git-annex becomes a podcatcher in 150 LOC 2013-07-28 16:55:42 -04:00
justjohn
e63353111d Added a comment: Broken on 4.3 on Nexus 7 2013-07-28 16:14:18 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnljkMF1zhScDfvJYMhXXubnar_DakLoas
ef51bdb54f Added a comment: broken under 4.3? 2013-07-28 00:36:51 +00:00
http://joeyh.name/
681520e761 Added a comment 2013-07-27 21:53:57 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmhGq_ii5HaDkp9nx2m9qIMe-xxI4HV5wo
3f6957d1ec Added a comment 2013-07-27 21:53:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmhGq_ii5HaDkp9nx2m9qIMe-xxI4HV5wo
c42494dc90 Added a comment 2013-07-27 21:51:11 +00:00
http://joeyh.name/
7029df5b59 Added a comment 2013-07-27 20:12:33 +00:00
Joey Hess
4aa8f4bf7f move comment 2013-07-27 16:06:59 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmhGq_ii5HaDkp9nx2m9qIMe-xxI4HV5wo
0189bf91f8 Added a comment: Packages way out of date 2013-07-27 19:02:38 +00:00
Joey Hess
8c6efd1b1b force link of libxml2 seems necessary now 2013-07-27 13:50:10 -04:00
http://joeyh.name/
0808997c68 Added a comment 2013-07-27 17:49:07 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl7dGdYtCHb7xleEOp6n8yaUQ4UtaiAEEs
9eceb590e8 Added a comment: libxml-sax Error on OS X fresh install 2013-07-27 13:11:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl7dGdYtCHb7xleEOp6n8yaUQ4UtaiAEEs
9cc456750d removed 2013-07-27 13:11:14 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl7dGdYtCHb7xleEOp6n8yaUQ4UtaiAEEs
e4c8cd15f2 Added a comment: libxml-sax Error on OS X fresh install 2013-07-27 13:10:09 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmRFKwny4rArBaz-36xTcsJYqKIgdDaw5Q
9a1f017d7e Added a comment 2013-07-25 02:19:54 +00:00
Joey Hess
cb8feb7be0 temporarily use http for android download links, until we can determine why https fails on android 
<puck> joeyh:  Also, I still can't download the daily Android apk to my
  phone. I can browse the download area via https site just fine. But I'm
  told that my download was unsuccessful. No error messages. :(
<puck> In the download list it has &lt;Unknown&gt;
 2013-07-23 17:36:38 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmJdzisfT6DhorwRz0kKJ_9-zQbccCopu4
b20cc0ee55 Added a comment: Macports _iconv 2013-07-18 14:23:02 +00:00
Joey Hess
6402f2081e Revert "avoid pulling in unneeded dependencies when the assistant is disabled" 
Cabal does not seem to have a way to check if flag A is set and then, if
flag B is set, add a dep. Instead, it makes flag B get unset if the
dep is not available.
 2013-07-16 11:29:43 -04:00
Joey Hess
08385e8552 improve cabal install instructions to not need lots of C libs 2013-07-12 15:45:34 -04:00
https://www.google.com/accounts/o8/id?id=AItOawk1MwAbPhkvUfU6duYaUnLFC_PXI2VfwtE
333365cafa add a step to make sure that $HOME/bin exists - this tripped me up. 2013-07-08 07:20:04 +00:00
http://joeyh.name/
0e83bd6b4d Added a comment 2013-07-07 17:21:10 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmF3Klaj8Q0Czfh1F3jaLF6issqeAhmru4
8cf7bd3eb5 Added a comment: Wheezy Support 2013-07-05 21:21:39 +00:00
http://joeyh.name/
de2b451ca3 Added a comment 2013-07-05 00:53:00 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmhfodZquCI_EEl-f3h7HkROTszlsQL6yA
0f164a7b3e Added a comment 2013-07-04 15:06:36 +00:00
Joey Hess
306f8a4c45 downloads.kitenet.net now supports https; use it for all links 2013-06-26 19:21:19 -04:00
http://joeyh.name/
37d245286e Added a comment 2013-06-25 17:58:57 +00:00
http://joeyh.name/
03efc426df Added a comment 2013-06-25 17:16:46 +00:00
krig
e4e2a807f9 Added a comment: Could not resolve dependencies for yesod 2013-06-25 06:14:19 +00:00
Joey Hess
0aaabc093e I'm told raring has the webapp 2013-06-22 11:11:35 -04:00
http://josh.easyid.net/
95947e2f32 Added a comment: Minimum version of Android? 2013-06-18 22:05:02 +00:00
https://www.google.com/accounts/o8/id?id=AItOawknXZSnvd0_L1Gc1XKYT4qr5e8zTcn371U
31ec33cc9d Added very easy SL6/CentOS6 instructions so that hopefully someone else will not waste hours of their life 2013-06-17 16:34:52 +00:00
https://openid.fmarier.org/
29d5bb94b4 Added a comment: New PPA only contains git-annex 2013-06-15 07:45:14 +00:00
https://openid.fmarier.org/
d073482cb2 update to my new git-annex PPA 2013-06-15 07:44:05 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9J51AO9t75xN5k0sJgg8taUo4y0a4hpQ
49ea56e81c 2013-06-11 19:04:17 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9J51AO9t75xN5k0sJgg8taUo4y0a4hpQ
89969b2622 Added cabal bin path for brew 2013-06-10 19:00:33 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnEgT3Gxm4AAK4zu3ft5-PsUmY6dr1F-gE
f33b0421bd Added a comment: OSX app bundle 2013-06-05 17:35:49 +00:00
Joey Hess
8100cad9d5 Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-30 21:49:36 -04:00
http://hands.com/~phil/
739e492487 Added a comment 2013-05-30 19:56:07 +00:00
http://joeyh.name/
02cd242ca0 Added a comment 2013-05-30 19:42:05 +00:00
Joey Hess
13bf70107e update 2013-05-30 15:17:26 -04:00
http://hands.com/~phil/
2e0f464aee Added a comment: any chance of a wheezy-backports upload? 2013-05-30 18:43:52 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnaH44G3QbxBAYyDwy0PbvL0ls60XoaR3Y
83f20a1174 Added a comment: Some errors after the build 2013-05-30 16:38:37 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnaH44G3QbxBAYyDwy0PbvL0ls60XoaR3Y
1f132810a2 Added a comment: Re: Comment 3 2013-05-30 16:29:12 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnaH44G3QbxBAYyDwy0PbvL0ls60XoaR3Y
bc63a5be57 Added a comment: Re: Comment 3 2013-05-30 15:48:44 +00:00
http://joeyh.name/
a18ff3defc Added a comment 2013-05-30 15:25:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnaH44G3QbxBAYyDwy0PbvL0ls60XoaR3Y
fb0a917e01 Added a comment: E: Unable to locate package libghc-libxml-sax-dev 2013-05-30 15:05:47 +00:00
http://joeyh.name/
a358dc8206 Added a comment 2013-05-29 16:23:12 +00:00
http://mey.vn/
2b61bcbfc0 Added a comment: libc6 dep version on amd64 2013-05-28 15:28:47 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnu1NYw8UF-NoDbKu8YKVGxi8FoZLH7JPs
7298f95a76 Added a step I had to do on my own OS X machine with 10.6 in order for the build to work. 2013-05-25 18:36:37 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlQ7ZdQxAps4v0cl5J3wKGWD8243Gy8-m0
2ef63c6d80 Added a comment: PPA Package Pinning 2013-05-23 21:18:14 +00:00
Joey Hess
668e073829 fix link to windows autobuild 2013-05-21 14:28:12 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY
ddd99d3296 Added a comment 2013-05-20 15:53:25 +00:00
Joey Hess
66fe5beac2 update 2013-05-19 18:03:38 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o
77d01941a4 Add note about no webapp in Raring 2013-05-19 21:57:27 +00:00
Joey Hess
345ee4f37c Switch to MonadCatchIO-transformers for better handling of state while catching exceptions. 
As seen in this bug report, the lifted exception handling using the StateT
monad throws away state changes when an action throws an exception.
http://git-annex.branchable.com/bugs/git_annex_fork_bombs_on_gpg_file/
  .. Which can result in cached values being redundantly calculated, or other
     possibly worse bugs when the annex state gets out of sync with reality.

This switches from a StateT AnnexState to a ReaderT (MVar AnnexState).
All changes to the state go via the MVar. So when an Annex action is
running inside an exception handler, and it makes some changes, they
immediately go into affect in the MVar. If it then throws an exception
(or even crashes its thread!), the state changes are still in effect.

The MonadCatchIO-transformers change is actually only incidental.
I could have kept on using lifted-base for the exception handling.
However, I'd have needed to write a new instance of MonadBaseControl
for the new monad.. and I didn't write the old instance.. I begged Bas
and he kindly sent it to me. Happily, MonadCatchIO-transformers is
able to derive a MonadCatchIO instance for my monad.

This is a deep level change. It passes the test suite! What could it break?

Well.. The most likely breakage would be to code that runs an Annex action
in an exception handler, and *wants* state changes to be thrown away.
Perhaps the state changes leaves the state inconsistent, or wrong. Since
there are relatively few places in git-annex that catch exceptions in the
Annex monad, and the AnnexState is generally just used to cache calculated
data, this is unlikely to be a problem.

Oh yeah, this change also makes Assistant.Types.ThreadedMonad a bit
redundant. It's now entirely possible to run concurrent Annex actions in
different threads, all sharing access to the same state! The ThreadedMonad
just adds some extra work on top of that, with its own MVar, and avoids
such actions possibly stepping on one-another's toes. I have not gotten
rid of it, but might try that later. Being able to run concurrent Annex
actions would simplify parts of the Assistant code.
 2013-05-19 14:16:36 -04:00
Joey Hess
83db599b6e remove old comments, there is a build script now 2013-05-17 14:36:47 -04:00
Joey Hess
51592944a2 fix link 2013-05-17 14:36:16 -04:00
Joey Hess
ddf98cd644 update 2013-05-17 13:45:33 -04:00
Joey Hess
4ba6a88aba update with autobuilder 2013-05-17 13:38:45 -04:00
Joey Hess
ebe10edf67 add dep needed with newer ghc 2013-05-17 11:24:07 -04:00
http://joeyh.name/
47a035b748 Added a comment 2013-05-16 16:17:52 +00:00
Joey Hess
4f8b21a0d5 Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-16 10:44:52 -04:00
Joey Hess
96ec715292 typo 2013-05-15 22:31:56 -04:00
http://joeyh.name/
8a265448b7 Added a comment 2013-05-16 02:29:10 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkGCmVc5qIJaQQgG82Hc5zzBdAVdhe2JEM
a97a6d6792 Added a comment 2013-05-16 02:22:26 +00:00
Joey Hess
aba49995b6 Merge branch 'master' into windows 2013-05-15 19:18:04 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkGCmVc5qIJaQQgG82Hc5zzBdAVdhe2JEM
758537d329 Added a comment 2013-05-15 18:29:19 +00:00
Joey Hess
9a8fec717f update 2013-05-14 20:12:13 -04:00
Joey Hess
dc66b1f27d Merge branch 'master' into windows 
Conflicts:
	Annex/Environment.hs
	Build/Configure.hs
	Git/Construct.hs
	Utility/FileMode.hs
 2013-05-14 15:37:24 -04:00
Joey Hess
49e9296d5f update 2013-05-14 15:14:11 -04:00
Joey Hess
b28358509f update 
No need to edit Makefile to disable webapp build anymore; just build w/o
dependencies installed.
 2013-05-13 13:47:11 -04:00
Joey Hess
f6fee49227 update for Windows 2013-05-13 13:46:03 -04:00