CVS commit: src/external/cddl/osnet/dev/sdt

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Fri Oct  2 17:13:32 UTC 2015

Modified Files:
        src/external/cddl/osnet/dev/sdt: sdt.c

Log Message:
Merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/cddl/osnet/dev/sdt/sdt.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.