[glibmm/glibmm-2-20-mm-common: 175/179] Merge commit '85f5b52c5f5af794199e05fc60c83e69852c88bb' into glibmm-2-20-mm-common

[Daniel Elstner <daniel src gnome org>]

commit d092484a457b70d0f0850d9430bb72e9362b4ad5
Merge: 9fc2d96... 85f5b52...
Author: Daniel Elstner <daniel kitta gmail com>
Date:   Sat Sep 5 11:21:12 2009 +0200

    Merge commit '85f5b52c5f5af794199e05fc60c83e69852c88bb' into glibmm-2-20-mm-common

 ChangeLog                  |   17 +++++++++++++++++
 Makefile.am                |    4 ++--
 docs/reference/Doxyfile.in |   10 +++++-----
 3 files changed, 24 insertions(+), 7 deletions(-)
---
diff --cc ChangeLog
index 07e2967,f59a680..7d30166
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,29 +1,22 @@@
+ 2009-09-01  Daniel Elstner  <daniel kitta gmail com>
+ 
+ 	Update Doxygen configuration for Doxygen 1.6.1
+ 
+ 	* docs/reference/Doxyfile.in: Update configuration template using
+ 	Doxygen 1.6.1.
+ 	(SORT_MEMBERS_CTORS_1ST): Enable.
+ 
+ 2009-09-01  Daniel Elstner  <daniel kitta gmail com>
+ 
+ 	Always build tools/ subdirectory (bgo #593518)
+ 
+ 	* Makefile.am (SUBDIRS): Unconditionally recurse into the tools/
+ 	subdirectory, rather than only in maintainer-mode.  Otherwise, the
+ 	code generator support files located there would not be installed
+ 	when building a tarball of glibmm.
+ 
  2009-08-28  Daniel Elstner  <danielk openismus com>
  
 -	Increment version to glibmm 2.21.4.1
 -
 -	* configure.ac (AC_INIT): Increment version to 2.21.4.1.
 -	* NEWS: Write news entry for glibmm 2.21.4.1 release.
 -
 -2009-08-28  Daniel Elstner  <danielk openismus com>
 -
  	Use shared mm-common Doxygen style sheet
  
  	* configure.ac (MM_PREREQ): Require mm-common 0.7.