x

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@21122 ec53bebd-3082-4978-b11e-865c3cabbd6b

diff --git a/cf/ChangeLog b/cf/ChangeLog
index 1985a89207d925c5ad3f59caebfe288d8fed7bcd..dc3bfba66a95c1bf28bddf8e8be4b34e7b03a81c 100644 (file)
--- a/cf/ChangeLog
+++ b/cf/ChangeLog
@@ -1,5 +1,7 @@
 2007-06-18  Love Hörnquist Åstrand  <lha@it.su.se>
 
+       * Makefile.am.common: Merge from samba config.
+
        * Makefile.am.common (makedir-in-tree): depend on INFO_DEPS.
 
        * valgrind-suppressions: Unknown suppression in runtime link