git-annex/Types
Joey Hess e27b97d364 Merge branch 'master' into concurrentprogress
Conflicts:
	Command/Fsck.hs
	Messages.hs
	Remote/Directory.hs
	Remote/Git.hs
	Remote/Helper/Special.hs
	Types/Remote.hs
	debian/changelog
	git-annex.cabal
2015-05-12 13:23:22 -04:00
..
Availability.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
Backend.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
BranchState.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
CleanupActions.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
Command.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
Creds.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
Crypto.hs refactor 2015-04-19 10:57:14 -04:00
DesktopNotify.hs rejigger imports for clean build with ghc 7.10's AMP changes 2015-05-10 16:20:30 -04:00
Difference.hs rejigger imports for clean build with ghc 7.10's AMP changes 2015-05-10 16:20:30 -04:00
Distribution.hs a few hlints 2015-04-11 00:10:34 -04:00
FileMatcher.hs relFile does not have to be relative; rename to currFile 2015-02-06 16:03:02 -04:00
GitConfig.hs The ssh-options git config is now used by gcrypt, rsync, and ddar special remotes that use ssh as a transport. 2015-02-12 15:44:10 -04:00
Group.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
Key.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
KeySource.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
LockPool.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
Messages.hs use built-in progress meters for git when in parallel mode 2015-04-10 15:15:21 -04:00
MetaData.hs metadata: Fix encoding problem that led to mojibake when storing metadata strings that contained both unicode characters and a space (or '!') character. 2015-03-04 12:54:30 -04:00
NumCopies.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
Option.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
Remote.hs Merge branch 'master' into concurrentprogress 2015-05-12 13:23:22 -04:00
ScheduledActivity.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
StandardGroups.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
StoreRetrieve.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
TrustLevel.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
UrlContents.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
UUID.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
View.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00