From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/midori/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/midori') diff --git a/package/midori/Makefile b/package/midori/Makefile index 2c1013603..85da07fbe 100644 --- a/package/midori/Makefile +++ b/package/midori/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= midori PKG_VERSION:= 0.5.8 PKG_RELEASE:= 1 PKG_MD5SUM:= 5815eac39f4d9511ce2c71a81567647f -PKG_DESCR:= web browser +PKG_DESCR:= graphical web browser PKG_SECTION:= x11/apps PKG_DEPENDS:= libnotify webkitgtk PKG_BUILDDEP:= autotool cmake-host vala-host libnotify webkitgtk -- cgit v1.2.3