diff options
| author | mbr <mbr@FreeBSD.org> | 2003-09-02 11:09:45 +0000 |
|---|---|---|
| committer | mbr <mbr@FreeBSD.org> | 2003-09-02 11:09:45 +0000 |
| commit | 30c9dcd76d7c230bcde52165c16c72a02ea17ef0 (patch) | |
| tree | 63abb865003af33e2cba82c78e8cc94d7de6f75d /contrib/ntp | |
| parent | 0f311740fcfb479b8c3e536f63f5c2e4707d5ef7 (diff) | |
| download | FreeBSD-src-30c9dcd76d7c230bcde52165c16c72a02ea17ef0.zip FreeBSD-src-30c9dcd76d7c230bcde52165c16c72a02ea17ef0.tar.gz | |
Resolve conflicts:
* rev. 1.33/1.25
Diffstat (limited to 'contrib/ntp')
0 files changed, 0 insertions, 0 deletions
