CVS commit: othersrc/vmware-modules/source/vmmon

[Christoph Badura <bad%netbsd.org@localhost>]

Module Name:    othersrc
Committed By:   bad
Date:           Sun Feb 16 10:09:58 UTC 2003

Modified Files:
        othersrc/vmware-modules/source/vmmon: Makefile.linux
        othersrc/vmware-modules/source/vmmon/common: hostif.h vmx86.c
        othersrc/vmware-modules/source/vmmon/include: linux-version.h x86.h
        othersrc/vmware-modules/source/vmmon/linux: driver.c hostif.c

Log Message:
resolv conflicts


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 othersrc/vmware-modules/source/vmmon/Makefile.linux
cvs rdiff -r1.2 -r1.3 othersrc/vmware-modules/source/vmmon/common/hostif.h \
    othersrc/vmware-modules/source/vmmon/common/vmx86.c
cvs rdiff -r1.2 -r1.3 \
    othersrc/vmware-modules/source/vmmon/include/linux-version.h
cvs rdiff -r1.3 -r1.4 othersrc/vmware-modules/source/vmmon/include/x86.h
cvs rdiff -r1.2 -r1.3 othersrc/vmware-modules/source/vmmon/linux/driver.c \
    othersrc/vmware-modules/source/vmmon/linux/hostif.c

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