From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 27 Dec 2011 21:50:21 +0000 (+0100)
Subject: Merge branch 'maint' into msvc
X-Git-Tag: v1.11.2b~12^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da14dc7d8a597bf0960cc565f16b728955f4ebe4;p=thirdparty%2Fautomake.git

Merge branch 'maint' into msvc

* maint:
  fix: last ChangeLog entry
---

da14dc7d8a597bf0960cc565f16b728955f4ebe4
diff --cc ChangeLog
index 874b557f1,0c37e166f..cde6c86a0
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,6 +1,8 @@@
 +2011-12-27  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
- 	tests: drop unnecessary in 'subpkg.test'
+ 2011-12-27  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	tests: drop unnecessary requirement in 'subpkg.test'
  	* tests/subpkg.test ($required): Drop "bison", it is not required
  	anymore since commit `v1.11-502-g7e5ae80'.