[glibmm/glibmm-2-20-mm-common: 165/179] Merge commit '7a885c150739214110e85748bcf340de34fca610' into glibmm-2-20-mm-common

[Daniel Elstner <daniel src gnome org>]

commit 132e2b134cf1b304ed541663c1ff358714bc9c85
Merge: deeaaac... 7a885c1...
Author: Daniel Elstner <daniel kitta gmail com>
Date:   Sat Sep 5 10:53:45 2009 +0200

    Merge commit '7a885c150739214110e85748bcf340de34fca610' into glibmm-2-20-mm-common
    
    Conflicts:
    	ChangeLog
    	glib/src/Makefile_list_of_hg.am_fragment

 ChangeLog                       |   21 +++
 Makefile.am                     |   10 +-
 glib/glibmm/Makefile.am         |    2 -
 glib/src/glib_docs_override.xml |  351 ++++++++++++++++++++++++++++++++++++++-
 glib/src/keyfile.ccg            |   91 ++++++++---
 glib/src/keyfile.hg             |   54 +++++--
 6 files changed, 472 insertions(+), 57 deletions(-)
---
diff --cc ChangeLog
index 1aed146,8950823..4e0bdf0
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,31 +1,24 @@@
++2009-07-13  Jonathon Jongsma  <jonathon quotidian org>
++
++	* Makefile.am: fix release targets since we switched to git
++
+ 2009-07-14  Jonathon Jongsma  <jonathon quotidian org>
+ 
+ 	* Fix Bug #587173 â?? Fails to install when bootstrapped with Automake 1.11
+ 	* glib/glibmm/Makefile.am: remove .hg-generated headers from this
+ 	  Makefile to fix built with automake-1.11
+ 	* glib/src/Makefile_list_of_hg.am_fragment: re-format this list of
+ 	  .hg files so it's easier to both read and maintain
+ 
+ 2009-07-14  José Alburquerque  <jaalburqu svn gnome org>
+ 
+ 	* glib/src/glib_docs_override.xml:
+ 	* glib/src/keyfile.ccg:
+ 	* glib/src/keyfile.hg: Repair Glib::KeyFile docs with regard to
+ 	exceptions.  Make sure that the methods that throw exceptions are
+ 	implemented correctly if GLIBMM_EXCEPTIONS_ENABLED is not defined.
+ 	Bug #587766 (Tomasz Jankowski).
+ 
 -2.21.2:
 -
 -2009-07-13  Jonathon Jongsma  <jonathon quotidian org>
 -
 -	* Makefile.am: fix release targets since we switched to git
 -
 -2009-07-13  Jonathon Jongsma  <jonathon quotidian org>
 -
 -	* NEWS: updated
 -	* configure.ac: bumped version for release
 -
  2009-07-11  Daniel Elstner  <daniel kitta gmail com>
  
  	* configure.ac (GTKMM_ARG_ENABLE_FULLDOCS): Remove macro