summaryrefslogtreecommitdiffstatshomepage
path: root/.gitattributes
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2012-04-12 08:33:20 +0000
committer Aaron Giles <aaron@aarongiles.com>2012-04-12 08:33:20 +0000
commit332011b258268ad0df674ccf525d09c4c61e6f85 (patch)
treeaec14eed468c0f65626d13f3232b9f86d4fc7cf0 /.gitattributes
parent7d27b8c9ff3958dab5acda023fac187c51fc9b4a (diff)
Merged watchdog back into running_machine.
Renamed driver overrides to MCFG_MACHINE/SOUND/VIDEO_START_OVERRIDE to explicitly indicate they are overriding the default behavior. Put liberatr back the way it used to be.
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes2
1 files changed, 0 insertions, 2 deletions
diff --git a/.gitattributes b/.gitattributes
index ceec56348fd..69e9dc215e0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1410,8 +1410,6 @@ src/emu/video/vector.h svneol=native#text/plain
src/emu/video/vooddefs.h svneol=native#text/plain
src/emu/video/voodoo.c svneol=native#text/plain
src/emu/video/voodoo.h svneol=native#text/plain
-src/emu/watchdog.c svneol=native#text/plain
-src/emu/watchdog.h svneol=native#text/plain
src/ldplayer/layout/pr8210.lay svneol=native#text/plain
src/ldplayer/ldplayer.c svneol=native#text/plain
src/ldplayer/ldplayer.lst svneol=native#text/plain