Subject: CVS commit: othersrc/vmware-modules/source/vmmon/include
To: None <source-changes@netbsd.org>
From: Jaromir Dolecek <jdolecek@netbsd.org>
List: source-changes
Date: 06/29/2003 19:15:11
Module Name:	othersrc
Committed By:	jdolecek
Date:		Sun Jun 29 19:15:10 UTC 2003

Modified Files:
	othersrc/vmware-modules/source/vmmon/include: iocontrols.h modulecall.h

Log Message:
resolve conflicts after 3.2.1-2237 import


To generate a diff of this commit:
cvs rdiff -r1.4 -r1.5 \
    othersrc/vmware-modules/source/vmmon/include/iocontrols.h
cvs rdiff -r1.3 -r1.4 \
    othersrc/vmware-modules/source/vmmon/include/modulecall.h

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