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/libX11 | |
parent | 365261c9db442081290b7d21aba6201244af294d (diff) |
resolve merge conflict
Diffstat (limited to 'package/libX11')
-rw-r--r-- | package/libX11/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/libX11/Makefile b/package/libX11/Makefile index bc6c45336..3b6334da3 100644 --- a/package/libX11/Makefile +++ b/package/libX11/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= libX11 PKG_VERSION:= 1.6.2 PKG_RELEASE:= 1 PKG_MD5SUM:= 7e17129e1678355d8268883ee31a6edf -PKG_DESCR:= X11 client-side library +PKG_DESCR:= x11 client-side library PKG_SECTION:= x11/libs PKG_BUILDDEP:= xproto-host xextproto-host libXau-host libpthread-stubs-host PKG_BUILDDEP+= xcb-proto-host libxcb-host kbproto-host |