[yelp/41-settings-revamp: 3/3] Merge branch 'master' into 41-settings-revamp
- From: Shaun McCance <shaunm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [yelp/41-settings-revamp: 3/3] Merge branch 'master' into 41-settings-revamp
- Date: Mon, 26 Jul 2021 14:20:52 +0000 (UTC)
commit 677e8f09c7af1859b8dcf0492da0fda6826bf9c6
Merge: cb6ccd49 47b0dc96
Author: Shaun McCance <shaunm gnome org>
Date: Mon Jul 26 10:20:42 2021 -0400
Merge branch 'master' into 41-settings-revamp
configure.ac | 13 +-
.../icons/hicolor/scalable/apps/org.gnome.Yelp.svg | 548 ++-------------------
2 files changed, 41 insertions(+), 520 deletions(-)
---
diff --cc configure.ac
index 037fdaa2,3cc22de8..678b38b1
--- a/configure.ac
+++ b/configure.ac
@@@ -34,8 -43,8 +43,8 @@@ PKG_CHECK_MODULES(YELP
libxslt >= 1.1.4
libexslt >= 0.8.1
sqlite3
- webkit2gtk-4.1
+ $webkitdep
- yelp-xsl >= 3.27.1
+ yelp-xsl >= 40.0
])
AC_SUBST([YELP_CFLAGS])
AC_SUBST([YELP_LIBS])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]