From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/ntpclient/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/ntpclient/Makefile') diff --git a/package/ntpclient/Makefile b/package/ntpclient/Makefile index 126efcaea..2d7640017 100644 --- a/package/ntpclient/Makefile +++ b/package/ntpclient/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= ntpclient PKG_VERSION:= 2010_365 PKG_RELEASE:= 2 PKG_MD5SUM:= a64689398f2df8933ee0d8da246e9eaa -PKG_DESCR:= NTP client for setting system time from NTP servers -PKG_SECTION:= ntp +PKG_DESCR:= client for setting system time from ntp servers +PKG_SECTION:= net/ntp PKG_DEPENDS:= libpthread PKG_URL:= http://doolittle.icarus.com/ntpclient/ PKG_SITES:= http://doolittle.icarus.com/ntpclient/ -- cgit v1.2.3