git-annex/debian
Joey Hess 2e5ea30981 Merge branch 'master' into watch
Conflicts:
	debian/changelog
	git-annex.cabal
2012-06-12 13:37:17 -04:00
..
changelog Merge branch 'master' into watch 2012-06-12 13:37:17 -04:00
compat debhelper v9 2012-01-15 14:53:38 -04:00
control smart commit thread 2012-06-10 16:07:48 -04:00
copyright add a favicon 2012-05-10 14:18:35 -04:00
doc-base Add doc-base file. Closes: #621408 2011-04-06 21:57:22 -04:00
NEWS releasing version 3.20120123 2012-01-23 15:09:50 -04:00
rules update 2010-10-27 15:08:46 -04:00