From: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date: Mon, 26 Oct 2009 21:53:22 +0000 (-0400)
Subject: Merge branch 'libchamplain-0-4'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0007bb35ccbf9fd2c1613789e6fdbaf506f37f7c;p=libchamplain

Merge branch 'libchamplain-0-4'
---

0007bb35ccbf9fd2c1613789e6fdbaf506f37f7c
diff --cc AUTHORS
index 2cbaee4,bad8eb1..437f005
--- a/AUTHORS
+++ b/AUTHORS
@@@ -24,6 -24,6 +24,7 @@@ Frederic Peters <fpeters@0d.be
  Cosimo Cecchi <cosimoc@gnome.org>
  Vincent Untz <vuntz@gnome.org>
  Felix Riemann <friemann@gnome.org>
 +Cédric Bosdonnat <cedric.bosdonnat@free.fr>
  Halton Huo <halton.huo@sun.com>
  Bruce Cowan <bcowan@fastmail.co.uk>
+ Koop Mast <kwm@freebsd.org>
diff --cc configure.ac
index 1c6cf04,cb3cc45..8da5272
--- a/configure.ac
+++ b/configure.ac
@@@ -28,7 -28,7 +28,7 @@@ AM_PROG_CC_C_
  AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
  
  # Checks for libraries.
- LIBRARY_VERSION=1:0:1
 -LIBRARY_VERSION=2:0:2
++LIBRARY_VERSION=0:0:0
  # API_VERSION is used to generate pc files only
  API_VERSION=api_version
  CHAMPLAIN_MAJOR_VERSION=champlain_major_version