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/feh/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/feh/Makefile') diff --git a/package/feh/Makefile b/package/feh/Makefile index 4f9f56476..7b436064b 100644 --- a/package/feh/Makefile +++ b/package/feh/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 2.10 PKG_RELEASE:= 1 PKG_MD5SUM:= 6714dedeff1db5c3593c4a27b0d9cf50 PKG_DESCR:= image viewer -PKG_SECTION:= multimedia +PKG_SECTION:= mm/image PKG_BUILDDEP:= imlib2 giblib libXt PKG_DEPENDS:= imlib2 giblib PKG_SITES:= http://feh.finalrewind.org/ -- cgit v1.2.3