From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 27 Dec 2011 21:46:15 +0000 (+0100)
Subject: Merge branch 'maint' into branch-1.11
X-Git-Tag: v1.11.2b~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b0d61b88dde709cf138a46728fb8544066351bec;p=platform%2Fupstream%2Fautomake.git

Merge branch 'maint' into branch-1.11

* maint:
  fix: last ChangeLog entry
---

b0d61b88dde709cf138a46728fb8544066351bec
diff --cc ChangeLog
index c12f002,0c37e16..f348788
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,14 -1,6 +1,16 @@@
  2011-12-27  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
++2011-12-27  Stefano Lattarini  <stefano.lattarini@gmail.com>
++
 +	news: better visibility for planned backward incompatibilities
 +	* NEWS (New in 1.11.2): Explicitly report that support for
 +	automatic de-ANSI-fication has been deprecated.  Move news
 +	entries about planned backward incompatibilities ...
 +	(New in 1.11.2a): ... here.
 +
 +2011-12-27  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
- 	tests: drop unnecessary in 'subpkg.test'
+ 	tests: drop unnecessary requirement in 'subpkg.test'
  	* tests/subpkg.test ($required): Drop "bison", it is not required
  	anymore since commit `v1.11-502-g7e5ae80'.