summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorShaun McCance <shaunm@gnome.org>2014-06-16 17:15:38 -0400
committerShaun McCance <shaunm@gnome.org>2014-06-16 17:15:38 -0400
commit5fedb1eab1ea41fc87c0416eb91344c4cf6af7f7 (patch)
tree962cd1b2d807a7d8e3967a97c0ab7c541c2ed330 /configure.ac
parent780c67e4e48470457223fe03ae43a6017254fa1d (diff)
parent4d9d8742358c66e1d4f0efa9f2a83d8cef763caf (diff)
downloadyelp-5fedb1eab1ea41fc87c0416eb91344c4cf6af7f7.tar.gz
Merge branch 'master' into new-aday-design
Conflicts: src/yelp-window.c
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 787f47b0..67f5e12d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.63])
-AC_INIT([Yelp],[3.11.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=yelp],[yelp])
+AC_INIT([Yelp],[3.12.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=yelp],[yelp])
AC_CONFIG_SRCDIR([src/yelp.c])
AC_CONFIG_HEADERS([config.h])