diff options
| author | Josselin Mouette <joss@debian.org> | 2010-04-03 13:51:25 +0200 |
|---|---|---|
| committer | Josselin Mouette <joss@debian.org> | 2010-04-03 13:51:25 +0200 |
| commit | a99563cfccc7376e377d74ceffa20b97007cf711 (patch) | |
| tree | 209d75276eb0558450ec194753cb6bbe4333eb3e /configure.in | |
| parent | 379145060b8fc90fa7c81c0bff20d025e61adc38 (diff) | |
| parent | db4fc8e1373a6892ddbf4bf254a91c78f5ee6a42 (diff) | |
| download | yelp-a99563cfccc7376e377d74ceffa20b97007cf711.tar.gz | |
Merge branch 'gnome-2-30' into webkit
Conflicts:
src/yelp-html.c
src/yelp-window.c
stylesheets/db2html.xsl.in
Excluding commit a5588114ed94d00ca64913aa5b248e09a5e13edc
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 3c0b7ec9..5d633e47 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -AC_INIT([Yelp],[2.28.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=yelp],[yelp]) +AC_INIT([Yelp],[2.30.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=yelp],[yelp]) GNOME_COMMON_INIT @@ -55,9 +55,9 @@ PKG_CHECK_MODULES(YELP, [ gio-2.0 gconf-2.0 - gnome-doc-utils >= 0.17.2 + gnome-doc-utils >= 0.19.1 gtk+-unix-print-2.0 - gtk+-2.0 >= 2.10.0 + gtk+-2.0 >= 2.18.0 libxml-2.0 >= 2.6.5 libxslt >= 1.1.4 libexslt >= 0.8.1 |