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/libjpeg-turbo | |
parent | 365261c9db442081290b7d21aba6201244af294d (diff) |
resolve merge conflict
Diffstat (limited to 'package/libjpeg-turbo')
-rw-r--r-- | package/libjpeg-turbo/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/libjpeg-turbo/Makefile b/package/libjpeg-turbo/Makefile index d4e1a633e..751ec4c9a 100644 --- a/package/libjpeg-turbo/Makefile +++ b/package/libjpeg-turbo/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= libjpeg-turbo PKG_VERSION:= 1.3.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 2c3a68129dac443a72815ff5bb374b05 -PKG_DESCR:= JPEG library -PKG_SECTION:= libs +PKG_DESCR:= jpeg image library +PKG_SECTION:= libs/image PKG_URL:= http://libjpeg-turbo.virtualgl.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libjpeg-turbo/} PKG_OPTS:= dev |