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/libxkbfile | |
parent | 365261c9db442081290b7d21aba6201244af294d (diff) |
resolve merge conflict
Diffstat (limited to 'package/libxkbfile')
-rw-r--r-- | package/libxkbfile/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/libxkbfile/Makefile b/package/libxkbfile/Makefile index fc7d52cca..d2086afa7 100644 --- a/package/libxkbfile/Makefile +++ b/package/libxkbfile/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= libxkbfile PKG_VERSION:= 1.0.8 PKG_RELEASE:= 2 PKG_MD5SUM:= f5b92ef9813c6b78105dfa960ddddcaa -PKG_DESCR:= X11 keyboard configuration extension library +PKG_DESCR:= keyboard configuration extension library PKG_SECTION:= x11/libs PKG_BUILDDEP:= kbproto libX11 PKG_SITES:= ${MASTER_SITE_XORG} |