diff options
| author | rwatson <rwatson@FreeBSD.org> | 2007-04-16 15:41:56 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2007-04-16 15:41:56 +0000 |
| commit | f9910199a6d5534ba38ae4479e7e57822e730a4a (patch) | |
| tree | 9d8cd84c1d9165d3ad8b412d23c017c91aaaba4a /contrib/openbsm/test | |
| parent | f9483b7f231183d1ea4bf06a713e4e3297952e1c (diff) | |
| download | FreeBSD-src-f9910199a6d5534ba38ae4479e7e57822e730a4a.zip FreeBSD-src-f9910199a6d5534ba38ae4479e7e57822e730a4a.tar.gz | |
Resolve conflicts from OpenBSM 1.0 alpha 14 import.
Diffstat (limited to 'contrib/openbsm/test')
| -rw-r--r-- | contrib/openbsm/test/reference/process32ex_record | bin | 66 -> 0 bytes |
| -rw-r--r-- | contrib/openbsm/test/reference/process32ex_token | bin | 41 -> 0 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/contrib/openbsm/test/reference/process32ex_record b/contrib/openbsm/test/reference/process32ex_record Binary files differdeleted file mode 100644 index aa2cb56..0000000 --- a/contrib/openbsm/test/reference/process32ex_record +++ /dev/null diff --git a/contrib/openbsm/test/reference/process32ex_token b/contrib/openbsm/test/reference/process32ex_token Binary files differdeleted file mode 100644 index ba84a2a..0000000 --- a/contrib/openbsm/test/reference/process32ex_token +++ /dev/null |
