]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
projects / FreeBSD / FreeBSD.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 67c9dec) | patch
Resolve conflicts, generally in favor of the vendor version.
authordougb <dougb@FreeBSD.org>
Mon, 1 Jul 2002 01:20:28 +0000 (01:20 +0000)
committerdougb <dougb@FreeBSD.org>
Mon, 1 Jul 2002 01:20:28 +0000 (01:20 +0000)
commit6c7d734ad5356ca0a26e4ac4a48b159367a32613
treeaac3a8864bfcf09cca9408465b0649334b61d842tree | snapshot
parent67c9dec97554c34ae92f7d669f1c0de844fcf4c8commit | diff
Resolve conflicts, generally in favor of the vendor version.
contrib/bind/bin/named-xfer/named-xfer.c diff | blob | history
contrib/bind/bin/nslookup/commands.l diff | blob | history
contrib/bind/bin/nslookup/getinfo.c diff | blob | history
contrib/bind/bin/nslookup/main.c diff | blob | history
contrib/bind/doc/man/dig.1 diff | blob | history
contrib/bind/doc/man/host.1 diff | blob | history
contrib/bind/port/freebsd/include/port_before.h diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.