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/xf86dgaproto/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/xf86dgaproto') diff --git a/package/xf86dgaproto/Makefile b/package/xf86dgaproto/Makefile index 17027dcd1..483e1c7c0 100644 --- a/package/xf86dgaproto/Makefile +++ b/package/xf86dgaproto/Makefile @@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xf86dgaproto PKG_VERSION:= 2.1 PKG_RELEASE:= 1 -PKG_DESCR:= XFree86-DGA headers -PKG_SECTION:= devel +PKG_DESCR:= xfree86-dga headers +PKG_SECTION:= dev/header PKG_MD5SUM:= 1fe79dc07857ad3e1fb8b8f2bdd70d1b PKG_SITES:= ${MASTER_SITE_XORG} PKG_OPTS:= dev devonly -- cgit v1.2.3