diff options
author | 2016-11-26 08:49:17 +1100 | |
---|---|---|
committer | 2016-11-26 08:49:17 +1100 | |
commit | 0b1a51a9d1700d8b22d65602b9f2a4dfb1a701ea (patch) | |
tree | 4a8b4935070429aace58b1ea0149a835b9609af9 /src/emu/device.cpp | |
parent | a68cefdb4f220455e9a29e98d3b270958078d5ea (diff) | |
parent | 7ad15e78260f5dc28912cc700fc87838ca75f198 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/emu/device.cpp')
-rw-r--r-- | src/emu/device.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/emu/device.cpp b/src/emu/device.cpp index 321c7b18390..a78e7173342 100644 --- a/src/emu/device.cpp +++ b/src/emu/device.cpp @@ -323,7 +323,7 @@ void device_t::set_machine(running_machine &machine) } //------------------------------------------------- -// findit - seach for all objects in auto finder +// findit - search for all objects in auto finder // list and return status //------------------------------------------------- @@ -564,7 +564,7 @@ ioport_constructor device_t::device_input_ports() const //------------------------------------------------- // device_reset - actually handle resetting of -// a device; designed to be overriden by the +// a device; designed to be overridden by the // actual device implementation //------------------------------------------------- @@ -577,7 +577,7 @@ void device_t::device_reset() //------------------------------------------------- // device_reset_after_children - hook to do // reset logic that must happen after the children -// are reset; designed to be overriden by the +// are reset; designed to be overridden by the // actual device implementation //------------------------------------------------- |