diff options
| author | Jakob Schlyter <jakob@cvs.openbsd.org> | 2007-01-25 07:31:26 +0000 |
|---|---|---|
| committer | Jakob Schlyter <jakob@cvs.openbsd.org> | 2007-01-25 07:31:26 +0000 |
| commit | 5ba26d4f49e12570f62d5ae78018a32ed16e6b44 (patch) | |
| tree | c88348c7d706f15c8c945e3b64944fa3ae354bd2 /libexec/tftp-proxy | |
| parent | 06371ecc6d7691c8a8943cdec25b4b1027961e67 (diff) | |
resolve conflicts with 9.3.4; SECURITY UPDATE
Diffstat (limited to 'libexec/tftp-proxy')
0 files changed, 0 insertions, 0 deletions