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/dnsmasq | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/dnsmasq')
| -rw-r--r-- | package/dnsmasq/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 88239aa10..fe1e51caa 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= dnsmasq PKG_VERSION:= 2.70 PKG_RELEASE:= 1 PKG_MD5SUM:= 1d654e80888ab5dbba015548fd284d46 -PKG_DESCR:= lightweight DNS and DHCP server -PKG_SECTION:= dns +PKG_DESCR:= lightweight dns, dhcp and tftp server +PKG_SECTION:= net/dns PKG_URL:= http://thekelleys.org.uk/dnsmasq/ PKG_SITES:= http://thekelleys.org.uk/dnsmasq/ |