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/gkrellm/Makefile | |
parent | 365261c9db442081290b7d21aba6201244af294d (diff) |
resolve merge conflict
Diffstat (limited to 'package/gkrellm/Makefile')
-rw-r--r-- | package/gkrellm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/gkrellm/Makefile b/package/gkrellm/Makefile index 86cd25b94..6f3a93343 100644 --- a/package/gkrellm/Makefile +++ b/package/gkrellm/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= gkrellm PKG_VERSION:= 2.3.5 PKG_RELEASE:= 1 PKG_MD5SUM:= 05d00fa8d6376038b0c7e967583c0b8d -PKG_DESCR:= GNU krell monitors server +PKG_DESCR:= krell monitors server PKG_SECTION:= net/misc PKG_DEPENDS:= glib libpthread PKG_BUILDDEP:= glib |