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/sane-backends/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/sane-backends') diff --git a/package/sane-backends/Makefile b/package/sane-backends/Makefile index 5d54f26f9..acaf4e9fc 100644 --- a/package/sane-backends/Makefile +++ b/package/sane-backends/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.22 PKG_RELEASE:= 3 PKG_MD5SUM:= fadf56a60f4776bfb24491f66b617cf5 PKG_DESCR:= scanner access now easy -PKG_SECTION:= misc +PKG_SECTION:= sys/misc PKG_DEPENDS:= libpthread PKG_BUILDDEP:= libpthread libusb libusb-compat PKG_URL:= http://www.sane-project.org/ -- cgit v1.2.3