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/libXdmcp/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libXdmcp') diff --git a/package/libXdmcp/Makefile b/package/libXdmcp/Makefile index 1a00688e9..70aff9bad 100644 --- a/package/libXdmcp/Makefile +++ b/package/libXdmcp/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= libXdmcp PKG_VERSION:= 1.1.1 PKG_RELEASE:= 2 PKG_MD5SUM:= 194f30d2bb67b23dc33351e128db40a9 -PKG_DESCR:= X11 display manager control protocol library +PKG_DESCR:= display manager control protocol library PKG_SECTION:= x11/libs PKG_BUILDDEP:= xproto PKG_SITES:= ${MASTER_SITE_XORG} -- cgit v1.2.3