X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=ChangeLog;h=d8e85425394996f7b9059cab81181d4e2c421ae5;hb=f544f13b91fa2ebc2a5c91eb81098d93af639bfe;hp=56f50b4f3bc9e4145d5279ad1fa3bfc518d9cf6a;hpb=21c929acd4a42145fc353c2e2507816022039e2a;p=dak.git

diff --git a/ChangeLog b/ChangeLog
index 56f50b4f..d8e85425 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,14 @@
 2005-11-25  Anthony Towns  <aj@erisian.com.au>
 
+	* Finishing merge of changes from spohr, by various people still
+
 	* jennifer: If changed-by parsing fails, set variables to "" so REJECT
 	works
 	* jennifer: Re-enable .deb ar format checking
 	* katie.py: Convert to +bX binNMU special casing
 	* rhona: Add some debug output when deleting binaries
 	* cron.daily: Add emilie
+	* cron.unchecked: Add lock files
 
 2005-11-15  Anthony Towns  <aj@erisian.com.au>