CVSROOT:        /cvs
Module name:    ports
Changes by:     [email protected]   2010/10/28 16:34:47

Modified files:
        emulators/qemu : Makefile 
        emulators/qemu/pkg: PLIST 
        emulators/qemu-old: Makefile 
        emulators/qemu-old/pkg: PLIST 

Log message:
remove bogus conflict markers and bump, problem noticed by henning@

Reply via email to