Joey Hess 35551d0ed0 Merge branch 'master' into s3-aws ... Conflicts: Remote/S3.hs		2014-10-22 17:14:38 -04:00
..
Chunked	better exception display	2014-07-26 23:01:44 -04:00
AWS.hs	WIP converting S3 special remote from hS3 to aws library	2014-08-08 19:00:53 -04:00
Chunked.hs	add per-remote-type info	2014-10-21 14:36:09 -04:00
Encryptable.hs	show in info whether a remote uses hybrid encryption or not	2014-10-22 14:39:59 -04:00
Git.hs	add per-remote-type info	2014-10-21 14:36:09 -04:00
Hooks.hs	more lock file refactoring	2014-08-20 18:58:14 -04:00
Http.hs	S3: convert to aws for store, remove, checkPresent	2014-08-09 14:26:19 -04:00
Messages.hs	run Preparer to get Remover and CheckPresent actions	2014-08-06 14:28:36 -04:00
ReadOnly.hs	Remotes can now be made read-only, by setting remote.<name>.annex-readonly	2014-01-02 13:12:32 -04:00
Special.hs	add per-remote-type info	2014-10-21 14:36:09 -04:00
Ssh.hs	testremote: Add testing of behavior when remote is not available	2014-08-10 15:02:59 -04:00