Previous 199869 Revisions Next

r197803 Sunday 25th June, 2023 at 17:11:10 UTC by Angelo Salese
Fix merge conflicts
[/branches/vga_modern-2/scripts/src]bus.lua video.lua
[/branches/vga_modern-2/src/devices/bus/isa]s3virge.cpp s3virge.h svga_cirrus.cpp svga_cirrus.h svga_s3.cpp svga_s3.h svga_trident.cpp svga_trident.h svga_tseng.cpp svga_tseng.h vga.cpp vga.h vga_ati.cpp vga_ati.h
[/branches/vga_modern-2/src/devices/machine]sis630_gui.cpp sis630_gui.h
[/branches/vga_modern-2/src/devices/video]clgd542x.cpp clgd542x.h ibm8514a.cpp pc_vga.cpp pc_vga.h pc_vga_ati.cpp pc_vga_ati.h pc_vga_cirrus.cpp* pc_vga_cirrus.h* pc_vga_nvidia.cpp pc_vga_nvidia.h pc_vga_s3.cpp pc_vga_s3.h pc_vga_sis.cpp* pc_vga_sis.h* pc_vga_trident.cpp pc_vga_trident.h pc_vga_tseng.cpp pc_vga_tseng.h pc_xga.cpp pc_xga.h riva128.cpp riva128.h s3virge.cpp* s3virge.h* virge_pci.cpp virge_pci.h
[/branches/vga_modern-2/src/mame/be]bebox.cpp
[/branches/vga_modern-2/src/mame/funworld]photoply.cpp
[/branches/vga_modern-2/src/mame/konami]konmedal020.cpp
[/branches/vga_modern-2/src/mame/misc]gambl186.cpp gammagic.cpp gamtor.cpp magtouch.cpp pntnpuzl.cpp savquest.cpp su2000.cpp
[/branches/vga_modern-2/src/mame/pc]fruitpc.cpp pangofun.cpp paokaipc.cpp pcat_dyn.cpp pcat_nit.cpp queen.cpp
[/branches/vga_modern-2/src/mame/trs]vis.cpp


Previous 199869 Revisions Next


© 1997-2024 The MAME Team