diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
tree | 7617315e619f969c13e79c1f44c2428871719357 /package/libXdmcp/Makefile | |
parent | 365261c9db442081290b7d21aba6201244af294d (diff) |
resolve merge conflict
Diffstat (limited to 'package/libXdmcp/Makefile')
-rw-r--r-- | package/libXdmcp/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
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} |