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/libXScrnSaver/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libXScrnSaver') diff --git a/package/libXScrnSaver/Makefile b/package/libXScrnSaver/Makefile index 1b934f16c..40d86ad17 100644 --- a/package/libXScrnSaver/Makefile +++ b/package/libXScrnSaver/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= libXScrnSaver PKG_VERSION:= 1.2.1 PKG_RELEASE:= 2 PKG_MD5SUM:= 8e459e544298caa27fc7c7e5a56e2a6d -PKG_DESCR:= X.Org XScrnSaver library +PKG_DESCR:= screensaver library PKG_SECTION:= x11/libs PKG_BUILDDEP:= scrnsaverproto libXext PKG_URL:= http://xorg.freedesktop.org/ -- cgit v1.2.3