Joey Hess ef01ff1e77 Merge branch 'master' into s3-aws ... Conflicts: git-annex.cabal		2014-08-15 17:30:40 -04:00
..
AWS.hs	S3: support chunking	2014-08-02 15:51:58 -04:00
Delete.hs	bootstrap3 forms	2014-04-21 19:47:05 +02:00
Edit.hs	Merge branch 'master' into s3-aws	2014-08-15 17:30:40 -04:00
Fsck.hs	bootstrap3 forms	2014-04-21 19:47:05 +02:00
IA.hs	bootstrap3 forms	2014-04-21 19:47:05 +02:00
Local.hs	refactor	2014-06-16 18:59:23 -04:00
Pairing.hs	bootstrap3 forms	2014-04-21 19:47:05 +02:00
Preferences.hs	bootstrap3 forms	2014-04-21 19:47:05 +02:00
Ssh.hs	export CreateProcess fields from Utility.Process	2014-06-10 19:20:14 -04:00
Unused.hs	bootstrap3 forms	2014-04-21 19:47:05 +02:00
Upgrade.hs	ensure that Android TH splice is expanded in native side of build	2013-11-25 13:01:53 -04:00
WebDAV.hs	fix more layout issues based on joey's feedback	2014-05-02 16:29:23 +02:00
XMPP.hs	bootstrap3 forms	2014-04-21 19:47:05 +02:00