mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' into assistant

Browse source 
Conflicts:
	git-annex.cabal
This commit is contained in:
Joey Hess 2012-07-22 12:50:54 -04:00
commit e4592649d6
13 changed files with 373 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
debian/changelog vendored
View file

@ -1,4 +1,4 @@
git-annex (3.20120630) UNRELEASED; urgency=low
git-annex (3.20120721) unstable; urgency=low
* get, move, copy: Now refuse to do anything when the requested file
transfer is already in progress by another process.
@ -13,7 +13,7 @@ git-annex (3.20120630) UNRELEASED; urgency=low
.tar.gz Closes: #680450
* map: Write map.dot to .git/annex, which avoids watch trying to annex it.
-- Joey Hess <joeyh@debian.org> Sun, 01 Jul 2012 15:04:37 -0400
-- Joey Hess <joeyh@debian.org> Sat, 21 Jul 2012 16:52:48 -0400
git-annex (3.20120629) unstable; urgency=low