aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/ChangeLog-2011 (renamed from include/ChangeLog)7
-rw-r--r--include/Makefile.am2
2 files changed, 8 insertions, 1 deletions
diff --git a/include/ChangeLog b/include/ChangeLog-2011
index 97f491e20..709842787 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-02 Werner Koch <[email protected]>
+
+ NB: ChangeLog files are no longer manually maintained. Starting
+ on December 1st, 2011 we put change information only in the GIT
+ commit log, and generate a top-level ChangeLog file from logs at
+ "make dist". See doc/HACKING for details.
+
2011-07-01 Werner Koch <[email protected]>
* cipher.h (PUBKEY_ALGO_ECDH, PUBKEY_ALGO_ECDSA): New.
diff --git a/include/Makefile.am b/include/Makefile.am
index 25518bfa1..4d733ba91 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1 +1 @@
-EXTRA_DIST = cipher.h types.h host2net.h _regex.h
+EXTRA_DIST = cipher.h types.h host2net.h _regex.h ChangeLog-2011