Module Name: src
Committed By: agc
Date: Sat Aug 7 05:30:58 UTC 2010
Modified Files:
src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64
md.sparc64 shl.mi
Log Message:
merge conflicts
this isn't how this was planned, but needed for releases to build. will
be revisited later
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/distrib/sets/lists/base/ad.mips64eb
cvs rdiff -u -r1.19 -r1.20 src/distrib/sets/lists/base/ad.mips64el
cvs rdiff -u -r1.92 -r1.93 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.87 -r1.88 src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.547 -r1.548 src/distrib/sets/lists/base/shl.mi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
