[glibmm: 4/4] Merge from glibmm-2-24

[Murray Cumming <murrayc src gnome org>]

commit 5ca5284ddd7aead24cbc9cc3c508b8c20fab365f
Merge: b62f53d f4c74d2
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon May 3 23:39:49 2010 +0200

    Merge from glibmm-2-24

 ChangeLog     |    9 +++++++++
 glib/glibmm.h |   33 +++++++++++++++++++++++++--------
 2 files changed, 34 insertions(+), 8 deletions(-)
---
diff --cc ChangeLog
index 366571c,0d93c0f..d569683
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,11 +1,18 @@@
+ 2010-05-03  Murray Cumming  <murrayc murrayc-x61>
+ 
+ 	Documentation: Add more links to main page, and mention giomm.
+ 	
+ 	* glib/glibmm.h: Add more doxggen links to groups and classes, based on 
+ 	http://www.gtkmm.org/documentation.shtml and a look at the classes list.
+ 	Mention giomm features and add giomm to the pkg-config calls and mention 
+ 	giomm.h
++	
 +2010-04-29  José Alburquerque  <jaalburqu svn gnome org>
 +
 +	gio_docs.xml: Regenerate with the new doc extraction tool.
 +
 +	* gio/src/gio_docs.xml: Regenerate docs with the latest
 +	docextract_to_xml.py in pygobject to get better docs in general.
  
  2010-04-27  David King  <davidk openismus com>