cvs commit: src/sys/contrib/dev/ath - Imported sources
Sam Leffler
sam at errno.com
Fri Nov 28 18:11:57 PST 2003
On Friday 28 November 2003 05:11 pm, Sam Leffler wrote:
> 1 conflicts created by this import.
> Use the following command to help the merge:
>
> cvs checkout -jATHEROS:yesterday -jATHEROS src/sys/contrib/dev/ath
For those that care, this was resolved by some repo magic. The conflict was
due to a versioning problem that occurred when I initially committed this
stuff.
Sam
More information about the cvs-src
mailing list