diff options
author | briantro <briantro@users.noreply.github.com> | 2017-03-22 14:36:19 -0500 |
---|---|---|
committer | briantro <briantro@users.noreply.github.com> | 2017-03-22 14:36:19 -0500 |
commit | 34f3c0d2b072b7870fd130657955b24a47c6c629 (patch) | |
tree | c85c37e2a46f0fb33c3139cbbe44c595563aecd4 /src | |
parent | b6038a03c074d509da7cbb3cd9d97ac15111eba2 (diff) | |
parent | f2bbc03722dde0e0cd414c0c5ec0f63864424cc2 (diff) |
Merge branch 'master' of https://github.com/mamedev/mame
Diffstat (limited to 'src')
-rw-r--r-- | src/devices/machine/6821pia.cpp | 2 | ||||
-rw-r--r-- | src/devices/machine/6821pia.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/devices/machine/6821pia.cpp b/src/devices/machine/6821pia.cpp index 2d1e20859dc..37edfc6449b 100644 --- a/src/devices/machine/6821pia.cpp +++ b/src/devices/machine/6821pia.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Nathan Woods +// copyright-holders:Aaron Giles, Nathan Woods /********************************************************************** Motorola 6821 PIA interface and emulation diff --git a/src/devices/machine/6821pia.h b/src/devices/machine/6821pia.h index 7eb3197d255..156d1d65b0c 100644 --- a/src/devices/machine/6821pia.h +++ b/src/devices/machine/6821pia.h @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Nathan Woods +// copyright-holders:Aaron Giles, Nathan Woods /********************************************************************** Motorola 6821 PIA interface and emulation |