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/libXtst/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libXtst') diff --git a/package/libXtst/Makefile b/package/libXtst/Makefile index ff8945648..4790863e4 100644 --- a/package/libXtst/Makefile +++ b/package/libXtst/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= libXtst PKG_VERSION:= 1.2.1 PKG_RELEASE:= 2 PKG_MD5SUM:= 8918809e47c29b44d25eb16b1586a15b -PKG_DESCR:= Xtst library +PKG_DESCR:= client interface to the record extension to the x protocol PKG_SECTION:= x11/libs PKG_BUILDDEP+= recordproto libXi HOST_BUILDDEP:= recordproto-host xproto-host xextproto-host -- cgit v1.2.3