Joey Hess 048b64024a sync: Automatically resolves merge conflicts. ... untested, but it compiles :)		2012-06-27 13:08:32 -04:00
..
changelog	sync: Automatically resolves merge conflicts.	2012-06-27 13:08:32 -04:00
compat	debhelper v9	2012-01-15 14:53:38 -04:00
control	Version build dependency on STM, and allow building without it, which disables the watch command.	2012-06-26 09:15:47 -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