Joey Hess 2879adc551 fix union merge to call diff-index with -- after the ref ... Otherwise, if there's a file in the repo with a name matching the ref, git could get confused and the merge not work.		2015-04-09 21:13:28 -04:00
..
tests	Debian: Run the builtin test suite as an autopkgtest.	2013-08-15 15:49:19 +02:00
cabal-wrapper	Add temporary workaround for bug #763078 which broke building on armel and armhf.	2014-09-27 14:22:04 -04:00
changelog	fix union merge to call diff-index with -- after the ref	2015-04-09 21:13:28 -04:00
compat	debhelper v9	2012-01-15 14:53:38 -04:00
control	avoid using --literal-pathspecs with git older than 1.8.1 which added it	2015-04-06 13:46:11 -04:00
copyright	update my email address and homepage url	2015-01-21 12:50:09 -04:00
doc-base	Add doc-base file. Closes: #621408	2011-04-06 21:57:22 -04:00
menu	fixups	2013-05-15 22:48:27 -04:00
NEWS	prep release	2013-10-02 16:13:45 -04:00
rules	remove annoouncedir target	2015-03-14 15:55:48 -04:00