fix

[dak.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 5658b0e3b288a2777cc76c630a339ab7dbadf717..70009f60c2fee9832aab399aefad0875d49d7279 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2008-11-16  Joerg Jaspert  <joerg@debian.org>
+
+       * scripts/debian/mkfilesindices: useless typical, doesnt have
+       i18n/ dirs. Force them in (i hope).
+
+2008-11-15  Thomas Viehmann <tv@beamnet.de>
+
+       * dak/show_deferred.py: handle uploads that do not close bugs
+
+2008-11-11  Joerg Jaspert  <joerg@debian.org>
+
+       * config/debian/dak.conf: good bye oldstable/o-p-u
+
 2008-11-10  Joerg Jaspert  <joerg@debian.org>
 
        * config/debian/cron.unchecked: how about us ignoring bugs.d.o
@@ -553,6 +566,7 @@
        * dak/stats.py: likewise
        * dak/symlink_dists.py: likewise
        * dak/transitions.py: likewise
+>>>>>>> sec-merge:ChangeLog
 
 2008-05-03  Joerg Jaspert  <joerg@debian.org>