appdefs and hud fixups
ignore userdata
appdefs and hud fixups
appdefs and hud fixups
syncmerge