diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-07-28 17:20:27 +0800 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-07-28 17:20:27 +0800 |
| commit | 1d153c1cf91edce537bc64efb01b5a496b35518e (patch) | |
| tree | de8ba4359a0341bd0c8c6e1a7495f4f39fb565f1 /configure.ac | |
| parent | b50b7039d3b52f33df94e5a3526d9f43a51401ad (diff) | |
| parent | 6df1c4bdd81fbbb288b8e49c3bea9a1dd2e005a6 (diff) | |
| download | gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar.gz gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar.bz2 gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar.lz gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar.xz gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar.zst gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.zip | |
Merge commit 'upstream/master' into mc5
Conflicts:
libempathy-gtk/empathy-account-widget.c
src/empathy.c
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index ce7decf66..f54e0247b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(Empathy, 2.27.4, http://bugzilla.gnome.org/browse.cgi?product=empathy) +AC_INIT(Empathy, 2.27.5, http://bugzilla.gnome.org/browse.cgi?product=empathy) AC_PREREQ(2.59) AC_COPYRIGHT([ Copyright (C) 2003-2007 Imendio AB @@ -9,11 +9,11 @@ AC_COPYRIGHT([ # (Interfaces removed: CURRENT++, AGE=0, REVISION=0) # (Interfaces added: CURRENT++, AGE++, REVISION=0) # (No interfaces changed: REVISION++) -LIBEMPATHY_CURRENT=26 +LIBEMPATHY_CURRENT=27 LIBEMPATHY_AGE=0 LIBEMPATHY_REVISION=0 -LIBEMPATHY_GTK_CURRENT=24 +LIBEMPATHY_GTK_CURRENT=25 LIBEMPATHY_GTK_AGE=0 LIBEMPATHY_GTK_REVISION=0 @@ -158,7 +158,7 @@ AM_GLIB_GNU_GETTEXT AC_ARG_ENABLE(network-manager, AS_HELP_STRING([--enable-network-manager=@<:@no/yes/auto@:>@], [build with network-manager support]), , - enable_webkit=auto) + enable_network_manager=auto) if test "x$enable_network_manager" != "xno"; then PKG_CHECK_MODULES(NETWORK_MANAGER, |