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/dri2proto/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/dri2proto') diff --git a/package/dri2proto/Makefile b/package/dri2proto/Makefile index ed7952018..23532800d 100644 --- a/package/dri2proto/Makefile +++ b/package/dri2proto/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= dri2proto PKG_VERSION:= 2.8 PKG_RELEASE:= 1 PKG_MD5SUM:= 19ea18f63d8ae8053c9fa84b60365b77 -PKG_DESCR:= DRI2 protocol headers -PKG_SECTION:= devel +PKG_DESCR:= dri2 protocol headers +PKG_SECTION:= dev/header PKG_SITES:= ${MASTER_SITE_XORG} PKG_OPTS:= dev devonly -- cgit v1.2.3