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/libpciaccess/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libpciaccess') diff --git a/package/libpciaccess/Makefile b/package/libpciaccess/Makefile index e9b7478cf..c32a32579 100644 --- a/package/libpciaccess/Makefile +++ b/package/libpciaccess/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= libpciaccess PKG_VERSION:= 0.13.2 PKG_RELEASE:= 1 PKG_MD5SUM:= c49bd638c78fa4124e11432c1a94b5f4 -PKG_DESCR:= X.org PCI access library +PKG_DESCR:= pci access library PKG_SECTION:= x11/libs PKG_SITES:= ${MASTER_SITE_XORG} PKG_OPTS:= dev -- cgit v1.2.3