Resolve conflicts.

Browse Source

* $FreeBSD$
  * connect std{in,out,err}. (r1.19)
  * prefer strlcpy to strpy. (r1.13)
  * quiet by default. (r1.6)
  * document -D option.

...

This commit is contained in:

Murray Stokely 2002-02-19 12:04:29 +00:00

parent 5e84f73d96

commit 727d8dcff2

1 changed files with 1935 additions and 1094 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3029

contrib/isc-dhcp/client/dhclient.c

File diff suppressed because it is too large Load Diff