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/cups/Makefile | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/cups/Makefile')
| -rw-r--r-- | package/cups/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/cups/Makefile b/package/cups/Makefile index 0272d30e6..6efa5b327 100644 --- a/package/cups/Makefile +++ b/package/cups/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= cups PKG_VERSION:= 1.7.1 PKG_RELEASE:= 4 PKG_MD5SUM:= 55277c40fd4b7183dc3671d39c5c42b7 -PKG_DESCR:= Common Unix Printing System +PKG_DESCR:= common unix printing system PKG_SECTION:= net/misc PKG_DEPENDS:= zlib libpthread libstdcxx PKG_BUILDDEP:= cups-host zlib |