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/libSM/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libSM') diff --git a/package/libSM/Makefile b/package/libSM/Makefile index aa77da957..fda460710 100644 --- a/package/libSM/Makefile +++ b/package/libSM/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= libSM PKG_VERSION:= 1.2.1 PKG_RELEASE:= 2 PKG_MD5SUM:= 1d507651e9fa50aab7ef11be9e0e2f20 -PKG_DESCR:= X11 Session Management library +PKG_DESCR:= session management library PKG_SECTION:= x11/libs PKG_DEPENDS:= libuuid PKG_BUILDDEP:= libICE util-linux -- cgit v1.2.3