X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=ChangeLog;h=d8e85425394996f7b9059cab81181d4e2c421ae5;hb=f544f13b91fa2ebc2a5c91eb81098d93af639bfe;hp=37603347313f59c78450029fd0a4c0e98381f4bc;hpb=1af29fa5f8b542b7cf18e2c116551f90b5b9b24d;p=dak.git

diff --git a/ChangeLog b/ChangeLog
index 37603347..d8e85425 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +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>