diff options
| author | Jakob Schlyter <jakob@cvs.openbsd.org> | 2006-04-05 17:36:37 +0000 |
|---|---|---|
| committer | Jakob Schlyter <jakob@cvs.openbsd.org> | 2006-04-05 17:36:37 +0000 |
| commit | 0505bad000912a66c4f92c91a72202b9250e4bd5 (patch) | |
| tree | 00d8701ac1f3ee5feadd765c0274e9ff0a95aeac /sys | |
| parent | 1da54ca1fd7764e567cd4bc055abd54d602773e1 (diff) | |
resolve conflicts
Diffstat (limited to 'sys')
0 files changed, 0 insertions, 0 deletions