[or-cvs] [tor/master 2/2] fold in the makefile.am changes entry

[arma at torproject.org]

Author: Roger Dingledine <arma at torproject.org>
Date: Fri, 13 Aug 2010 17:19:04 -0400
Subject: fold in the makefile.am changes entry
Commit: a1686d867e0a35417e1e65ad0730bcd116edd10f

---
 ChangeLog                |    5 +++++
 changes/makefile-var-exp |    5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 changes/makefile-var-exp

diff --git a/ChangeLog b/ChangeLog
index 2cbb4d3..e786469 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -74,6 +74,11 @@ Changes in version 0.2.2.15-alpha - 2010-08-??
       old and broken version of libevent. Treat 1.4.14b-stable like
       1.4.14-stable when parsing the version. Fixes bug 1731; bugfix
       on 0.2.2.1-alpha.
+    - Don't use substitution references like $(VAR:MOD) when
+      $(asciidoc_files) is empty -- make(1) on NetBSD transforms
+      '$(:x)' to 'x' rather than the empty string. This bites us in
+      doc/ when configured with --disable-asciidoc. Bugfix on
+      0.2.2.9-alpha; fixes bug 1773.
 
 
 Changes in version 0.2.2.14-alpha - 2010-07-12
diff --git a/changes/makefile-var-exp b/changes/makefile-var-exp
deleted file mode 100644
index 9918e2a..0000000
--- a/changes/makefile-var-exp
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Don't use substitution references ($(VAR:MOD)) when
-      $(asciidoc_files) is empty -- make(1) on NetBSD transforms
-      '$(:x)' to 'x' rather than the empty string. This bites us in
-      doc/ when configured with --disable-asciidoc.  Fixes bug 1773.
-- 
1.7.1