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/libxshmfence | |
parent | 365261c9db442081290b7d21aba6201244af294d (diff) |
resolve merge conflict
Diffstat (limited to 'package/libxshmfence')
-rw-r--r-- | package/libxshmfence/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/libxshmfence/Makefile b/package/libxshmfence/Makefile index ecfbcab73..c4181c90e 100644 --- a/package/libxshmfence/Makefile +++ b/package/libxshmfence/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= libxshmfence PKG_VERSION:= 1.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 323bb06c70765a2395df1d9c7ec3d14a -PKG_DESCR:= X11 xshmfence library +PKG_DESCR:= interface to shared-memory fences PKG_SECTION:= x11/libs PKG_SITES:= ${MASTER_SITE_XORG} PKG_OPTS:= dev |