Joey Hess b080a58b76 Merge branch 'master' into desymlink ... Conflicts: Annex/CatFile.hs Annex/Content.hs Git/LsFiles.hs Git/LsTree.hs		2012-12-13 00:29:06 -04:00
..
Content	direct mode committing	2012-12-12 19:20:38 -04:00
Branch.hs	finished where indentation changes	2012-12-13 00:24:19 -04:00
BranchState.hs	remove git-annex branch read cache	2012-10-19 14:25:15 -04:00
CatFile.hs	Merge branch 'master' into desymlink	2012-12-13 00:29:06 -04:00
CheckAttr.hs	finished where indentation changes	2012-12-13 00:24:19 -04:00
Content.hs	Merge branch 'master' into desymlink	2012-12-13 00:29:06 -04:00
Direct.hs	direct mode committing	2012-12-12 19:20:38 -04:00
Exception.hs	fixes for transfer resume	2012-09-24 13:18:16 -04:00
Journal.hs	finished where indentation changes	2012-12-13 00:24:19 -04:00
LockPool.hs	finished where indentation changes	2012-12-13 00:24:19 -04:00
Perms.hs	finished where indentation changes	2012-12-13 00:24:19 -04:00
Queue.hs	finished where indentation changes	2012-12-13 00:24:19 -04:00
Ssh.hs	finished where indentation changes	2012-12-13 00:24:19 -04:00
UUID.hs	finished where indentation changes	2012-12-13 00:24:19 -04:00
Version.hs	finished where indentation changes	2012-12-13 00:24:19 -04:00
Wanted.hs	--auto fixes	2012-12-06 13:22:16 -04:00