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/log4cxx | |
parent | 365261c9db442081290b7d21aba6201244af294d (diff) |
resolve merge conflict
Diffstat (limited to 'package/log4cxx')
-rw-r--r-- | package/log4cxx/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/log4cxx/Makefile b/package/log4cxx/Makefile index fd2dedb70..3d60eb4a7 100644 --- a/package/log4cxx/Makefile +++ b/package/log4cxx/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= log4cxx PKG_VERSION:= 0.10.0 PKG_RELEASE:= 2 PKG_MD5SUM:= b30ffb8da3665178e68940ff7a61084c -PKG_DESCR:= Apache logging framework for C++ -PKG_SECTION:= libs +PKG_DESCR:= apache logging framework for c++ +PKG_SECTION:= libs/misc PKG_DEPENDS:= apr apr-util PKG_BUILDDEP:= apr apr-util PKG_URL:= http://logging.apache.org/log4cxx/ |