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/scrnsaverproto/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/scrnsaverproto') diff --git a/package/scrnsaverproto/Makefile b/package/scrnsaverproto/Makefile index ca0d534f0..4f3566bea 100644 --- a/package/scrnsaverproto/Makefile +++ b/package/scrnsaverproto/Makefile @@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:= scrnsaverproto PKG_VERSION:= 1.2.2 PKG_RELEASE:= 1 -PKG_DESCR:= X11 screensaver headers -PKG_SECTION:= devel +PKG_DESCR:= screensaver headers +PKG_SECTION:= dev/header PKG_MD5SUM:= 21704f1bad472d94abd22fea5704bb48 PKG_SITES:= ${MASTER_SITE_XORG} PKG_OPTS:= dev devonly -- cgit v1.2.3