[glibmm/glibmm-2-20-mm-common: 177/179] Merge branch 'master' into glibmm-2-20-mm-common

[Daniel Elstner <daniel src gnome org>]

commit 69f6d15663303cfd721e44206b58a960f80e8fa1
Merge: e9da0bb... 5b99595...
Author: Daniel Elstner <daniel kitta gmail com>
Date:   Sat Sep 5 11:22:00 2009 +0200

    Merge branch 'master' into glibmm-2-20-mm-common

 ChangeLog                  |   16 ++++++++++++++++
 docs/reference/Doxyfile.in |    1 -
 glib/src/thread.hg         |   30 +++++++++++++++---------------
 3 files changed, 31 insertions(+), 16 deletions(-)
---
diff --cc ChangeLog
index 7d30166,4c01817..e408876
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,28 +1,21 @@@
+ 2009-09-03  Daniel Elstner  <danielk openismus com>
+ 
+ 	Sanitize the Glib::Cond usage example
+ 
+ 	* glib/src/thread.hg (Glib::Cond): Sanitize the usage example.
+ 
+ 2009-09-02  Daniel Elstner  <danielk openismus com>
+ 
+ 	Remove sigc from the Doxygen excluded symbols
+ 
+ 	* docs/reference/Doxyfile.in (EXCLUDE_SYMBOLS): Stop excluding
+ 	the sigc namespace from the documentation since it apparently
+ 	also removes the links to external documentation.  Also, with
+ 	the latest changes in libsigc++ it seems no longer necessary to
+ 	suppress the symbol.
+ 
  2009-09-01  Daniel Elstner  <daniel kitta gmail com>
  
 -	Increment version to glibmm 2.21.4.2
 -
 -	* configure.ac (AC_INIT): Increment version to 2.21.4.2.
 -	* NEWS: Write news entry for glibmm 2.21.4.2 release.
 -
 -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