[libgdamm] Resolved Merge

[Murray Cumming <murrayc src gnome org>]

commit ad41cf381c453b19c01d610768d38b5790262dcd
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Sep 14 12:41:52 2009 +0200

    Resolved Merge

 ChangeLog    |    4 ++++
 NEWS         |    5 +++++
 configure.ac |    2 +-
 3 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b582505..5ceab90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+3.99.18:
+
 2009-09-14  Daniel Elstner  <danielk openismus com>
 
 	Enable verbose output of autoreconf
@@ -26,6 +28,8 @@
 	* docs/reference/Doxyfile.in (EXCLUDE_SYMBOLS): Add "sigc" to the
 	list of symbols to ignore.
 
+3.99.17.1:
+
 2009-08-28  Daniel Elstner  <danielk openismus com>
 
 	Fix documentation location in pkg-config files
diff --git a/NEWS b/NEWS
index 378e23b..89454ff 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+3.99.18: (unstable)
+
+* MetaStruct: Add the MetaStructError exception, thrown by some methods.
+  (Murray Cumming)
+
 3.99.17.1: (unstable)
 
 * Reenable the per-class hierarchy graphs in the reference documentation.
diff --git a/configure.ac b/configure.ac
index 4083cd7..83b4698 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU Lesser General Public License
 ## along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([libgdamm], [3.99.17.1], [http://bugzilla.gnome.org/enter_bug.cgi?product=libgdamm],
+AC_INIT([libgdamm], [3.99.18], [http://bugzilla.gnome.org/enter_bug.cgi?product=libgdamm],
         [libgdamm], [http://www.gtkmm.org/])
 AC_PREREQ([2.59])