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/openobex/Makefile | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/openobex/Makefile')
| -rw-r--r-- | package/openobex/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/openobex/Makefile b/package/openobex/Makefile index 541ca79c3..c8c21dd6f 100644 --- a/package/openobex/Makefile +++ b/package/openobex/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= openobex PKG_VERSION:= 1.5 PKG_RELEASE:= 2 PKG_MD5SUM:= 0d83dc86445a46a1b9750107ba7ab65c -PKG_DESCR:= implementation of the Object Exchange (OBEX) protocol -PKG_SECTION:= misc +PKG_DESCR:= implementation of the obex protocol +PKG_SECTION:= sys/misc PKG_URL:= http://dev.zuckschwerdt.org/openobex/wiki/WikiStart PKG_SITES:= ${MASTER_SITE_KERNEL:=bluetooth/} PKG_OPTS:= dev |