[glibmm/glibmm-2-20: 3/3] Merge branch 'master' into glibmm-2-20

[Daniel Elstner <daniel src gnome org>]

commit 3e5ef11f6e026cf40102c67bb983ee1813032fc8
Merge: dceb8a3... c5383f5...
Author: Daniel Elstner <danielk openismus com>
Date:   Wed Sep 16 16:24:12 2009 +0200

    Merge branch 'master' into glibmm-2-20

 ChangeLog              |    8 ++++++++
 tools/pm/DocsParser.pm |   17 ++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)
---
diff --cc ChangeLog
index 51175a1,be2f187..38322fa
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,11 +1,19 @@@
+ 2009-09-17  Daniel Elstner  <danielk openismus com>
+ 
+ 	Do not complain about missing docs_override.xml
+ 
+ 	* tools/pm/DocsParser.pm (read_defs): Print error messages to
+ 	standard error.  Do not complain if the docs_override.xml file
+ 	is missing, since it is no longer necessary.
+ 
 +2009-09-16  Daniel Elstner  <danielk openismus com>
 +
 +	Increment version to 2.20.2 and update news
 +
 +	* configure.ac (AC_INIT): Bump version number to 2.20.2.
 +	(AM_INIT_AUTOMAKE): Add check-news option.
 +	* NEWS: Write news entry for the glibmm 2.20.2 release.
 +
  2009-09-13  Daniel Elstner  <daniel kitta gmail com>
  
  	Enable verbose output of autoreconf