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/libjansson | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/libjansson')
| -rw-r--r-- | package/libjansson/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/libjansson/Makefile b/package/libjansson/Makefile index 4fef0dd4b..5213bbaef 100644 --- a/package/libjansson/Makefile +++ b/package/libjansson/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= libjansson PKG_VERSION:= 2.5 PKG_RELEASE:= 1 PKG_MD5SUM:= 46ac93bec48aacf207b67b51c8fbf7f1 -PKG_DESCR:= JSON library -PKG_SECTION:= libs +PKG_DESCR:= json library +PKG_SECTION:= libs/data PKG_URL:= http://www.digip.org/jansson/ PKG_SITES:= http://www.digip.org/jansson/releases/ PKG_OPTS:= dev |