diff options
author | 2015-05-26 04:55:42 -0500 | |
---|---|---|
committer | 2015-05-26 04:55:42 -0500 | |
commit | a61f647f1e2f18defd10ba29424803209f9a97d7 (patch) | |
tree | aebebdbe37645f2cd788a0f0ddd0a7f183c45d91 /src/emu/sound | |
parent | 2d2c6b267a23d45fb66b8958e297b002dacf8fb4 (diff) | |
parent | 2f3085aa17c9114bae206337be26424f9a8d29fe (diff) |
Merge branch 'master' of https://github.com/mamedev/mame
Diffstat (limited to 'src/emu/sound')
-rw-r--r-- | src/emu/sound/ay8910.c | 2 | ||||
-rw-r--r-- | src/emu/sound/ay8910.h | 2 | ||||
-rw-r--r-- | src/emu/sound/disc_cls.h | 6 | ||||
-rw-r--r-- | src/emu/sound/disc_dev.h | 6 | ||||
-rw-r--r-- | src/emu/sound/disc_dev.inc | 4 | ||||
-rw-r--r-- | src/emu/sound/disc_flt.h | 6 | ||||
-rw-r--r-- | src/emu/sound/disc_flt.inc | 4 | ||||
-rw-r--r-- | src/emu/sound/disc_inp.inc | 4 | ||||
-rw-r--r-- | src/emu/sound/disc_mth.h | 6 | ||||
-rw-r--r-- | src/emu/sound/disc_mth.inc | 4 | ||||
-rw-r--r-- | src/emu/sound/disc_sys.inc | 4 | ||||
-rw-r--r-- | src/emu/sound/disc_wav.h | 6 | ||||
-rw-r--r-- | src/emu/sound/disc_wav.inc | 4 | ||||
-rw-r--r-- | src/emu/sound/discrete.c | 6 | ||||
-rw-r--r-- | src/emu/sound/discrete.h | 6 |
15 files changed, 41 insertions, 29 deletions
diff --git a/src/emu/sound/ay8910.c b/src/emu/sound/ay8910.c index ae8fb43ecbf..9decdb85c08 100644 --- a/src/emu/sound/ay8910.c +++ b/src/emu/sound/ay8910.c @@ -1,4 +1,4 @@ -// license:??? +// license:BSD-3-Clause // copyright-holders:Couriersud /* * Couriersud, July 2014: diff --git a/src/emu/sound/ay8910.h b/src/emu/sound/ay8910.h index 0c66f2ffa95..30ef634b766 100644 --- a/src/emu/sound/ay8910.h +++ b/src/emu/sound/ay8910.h @@ -1,4 +1,4 @@ -// license:??? +// license:BSD-3-Clause // copyright-holders:Couriersud #pragma once diff --git a/src/emu/sound/disc_cls.h b/src/emu/sound/disc_cls.h index 267a099bcc4..c03592a9f08 100644 --- a/src/emu/sound/disc_cls.h +++ b/src/emu/sound/disc_cls.h @@ -1,5 +1,5 @@ -// license:??? -// copyright-holders:Keith Wilkins, Derrick Renaud, F.Palazzolo, Couriersud +// license:BSD-3-Clause +// copyright-holders:K.Wilkins, Derrick Renaud, F.Palazzolo, Couriersud #pragma once #ifndef __DISC_CLS_H__ @@ -9,7 +9,7 @@ * * MAME - Discrete sound system emulation library * - * Written by Keith Wilkins (mame@esplexo.co.uk) + * Written by K.Wilkins (mame@esplexo.co.uk) * * (c) K.Wilkins 2000 * diff --git a/src/emu/sound/disc_dev.h b/src/emu/sound/disc_dev.h index f2103746429..80af62a3ae3 100644 --- a/src/emu/sound/disc_dev.h +++ b/src/emu/sound/disc_dev.h @@ -1,5 +1,5 @@ -// license:??? -// copyright-holders:Keith Wilkins +// license:BSD-3-Clause +// copyright-holders:K.Wilkins #pragma once #ifndef __DISC_DEV_H__ @@ -9,7 +9,7 @@ * * MAME - Discrete sound system emulation library * - * Written by Keith Wilkins (mame@esplexo.co.uk) + * Written by K.Wilkins (mame@esplexo.co.uk) * * (c) K.Wilkins 2000 * diff --git a/src/emu/sound/disc_dev.inc b/src/emu/sound/disc_dev.inc index dbf4c37d116..47026747cd1 100644 --- a/src/emu/sound/disc_dev.inc +++ b/src/emu/sound/disc_dev.inc @@ -1,8 +1,10 @@ +// license:BSD-3-Clause +// copyright-holders:K.Wilkins /************************************************************************ * * MAME - Discrete sound system emulation library * - * Written by Keith Wilkins (mame@dysfunction.demon.co.uk) + * Written by K.Wilkins (mame@esplexo.co.uk) * * (c) K.Wilkins 2000 * (c) Derrick Renaud 2003-2004 diff --git a/src/emu/sound/disc_flt.h b/src/emu/sound/disc_flt.h index ab2871e2c4c..3c6f2d72607 100644 --- a/src/emu/sound/disc_flt.h +++ b/src/emu/sound/disc_flt.h @@ -1,5 +1,5 @@ -// license:??? -// copyright-holders:Keith Wilkins +// license:BSD-3-Clause +// copyright-holders:K.Wilkins #pragma once #ifndef __DISC_FLTH__ @@ -9,7 +9,7 @@ * * MAME - Discrete sound system emulation library * - * Written by Keith Wilkins (mame@esplexo.co.uk) + * Written by K.Wilkins (mame@esplexo.co.uk) * * (c) K.Wilkins 2000 * diff --git a/src/emu/sound/disc_flt.inc b/src/emu/sound/disc_flt.inc index 4edda799999..18cb8f41c1c 100644 --- a/src/emu/sound/disc_flt.inc +++ b/src/emu/sound/disc_flt.inc @@ -1,8 +1,10 @@ +// license:BSD-3-Clause +// copyright-holders:K.Wilkins /************************************************************************ * * MAME - Discrete sound system emulation library * - * Written by Keith Wilkins (mame@esplexo.co.uk) + * Written by K.Wilkins (mame@esplexo.co.uk) * * (c) K.Wilkins 2000 * diff --git a/src/emu/sound/disc_inp.inc b/src/emu/sound/disc_inp.inc index 98fabfa7bf8..b9eedb9fdff 100644 --- a/src/emu/sound/disc_inp.inc +++ b/src/emu/sound/disc_inp.inc @@ -1,8 +1,10 @@ +// license:BSD-3-Clause +// copyright-holders:K.Wilkins /************************************************************************ * * MAME - Discrete sound system emulation library * - * Written by Keith Wilkins (mame@esplexo.co.uk) + * Written by K.Wilkins (mame@esplexo.co.uk) * * (c) K.Wilkins 2000 * diff --git a/src/emu/sound/disc_mth.h b/src/emu/sound/disc_mth.h index 411ad94720f..a459440a3b6 100644 --- a/src/emu/sound/disc_mth.h +++ b/src/emu/sound/disc_mth.h @@ -1,5 +1,5 @@ -// license:??? -// copyright-holders:Keith Wilkins +// license:BSD-3-Clause +// copyright-holders:K.Wilkins #pragma once #ifndef __DISC_MTH_H__ @@ -9,7 +9,7 @@ * * MAME - Discrete sound system emulation library * - * Written by Keith Wilkins (mame@esplexo.co.uk) + * Written by K.Wilkins (mame@esplexo.co.uk) * * (c) K.Wilkins 2000 * diff --git a/src/emu/sound/disc_mth.inc b/src/emu/sound/disc_mth.inc index 8b743cc0b9e..45e04654445 100644 --- a/src/emu/sound/disc_mth.inc +++ b/src/emu/sound/disc_mth.inc @@ -1,8 +1,10 @@ +// license:BSD-3-Clause +// copyright-holders:K.Wilkins /************************************************************************ * * MAME - Discrete sound system emulation library * - * Written by Keith Wilkins (mame@esplexo.co.uk) + * Written by K.Wilkins (mame@esplexo.co.uk) * * (c) K.Wilkins 2000 * (c) Derrick Renaud 2003-2004 diff --git a/src/emu/sound/disc_sys.inc b/src/emu/sound/disc_sys.inc index 23be15617b6..402482bd156 100644 --- a/src/emu/sound/disc_sys.inc +++ b/src/emu/sound/disc_sys.inc @@ -1,8 +1,10 @@ +// license:BSD-3-Clause +// copyright-holders:K.Wilkins /************************************************************************ * * MAME - Discrete sound system emulation library * - * Written by Keith Wilkins (mame@esplexo.co.uk) + * Written by K.Wilkins (mame@esplexo.co.uk) * * (c) K.Wilkins 2000 * (c) Derrick Renaud 2003-2004 diff --git a/src/emu/sound/disc_wav.h b/src/emu/sound/disc_wav.h index 41265415280..4775dd8fe68 100644 --- a/src/emu/sound/disc_wav.h +++ b/src/emu/sound/disc_wav.h @@ -1,5 +1,5 @@ -// license:??? -// copyright-holders:Keith Wilkins +// license:BSD-3-Clause +// copyright-holders:K.Wilkins #pragma once #ifndef __DISC_WAV_H__ @@ -9,7 +9,7 @@ * * MAME - Discrete sound system emulation library * - * Written by Keith Wilkins (mame@esplexo.co.uk) + * Written by K.Wilkins (mame@esplexo.co.uk) * * (c) K.Wilkins 2000 * diff --git a/src/emu/sound/disc_wav.inc b/src/emu/sound/disc_wav.inc index c73e721a754..57a90ae5a5b 100644 --- a/src/emu/sound/disc_wav.inc +++ b/src/emu/sound/disc_wav.inc @@ -1,7 +1,9 @@ +// license:BSD-3-Clause +// copyright-holders:K.Wilkins /************************************************************************ * * MAME - Discrete sound system emulation library - * Written by Keith Wilkins (mame@esplexo.co.uk) + * Written by K.Wilkins (mame@esplexo.co.uk) * * (c) K.Wilkins 2000 * diff --git a/src/emu/sound/discrete.c b/src/emu/sound/discrete.c index 2f57cc39ad5..d9bf63180db 100644 --- a/src/emu/sound/discrete.c +++ b/src/emu/sound/discrete.c @@ -1,10 +1,10 @@ -// license:??? -// copyright-holders:Keith Wilkins, Derrick Renaud, Frank Palazzolo, Couriersud +// license:BSD-3-Clause +// copyright-holders:K.Wilkins, Derrick Renaud, Frank Palazzolo, Couriersud /************************************************************************ * * MAME - Discrete sound system emulation library * - * Written by Keith Wilkins (mame@esplexo.co.uk) + * Written by K.Wilkins (mame@esplexo.co.uk) * * (c) K.Wilkins 2000 * diff --git a/src/emu/sound/discrete.h b/src/emu/sound/discrete.h index b2dc39e5ab9..921974193ab 100644 --- a/src/emu/sound/discrete.h +++ b/src/emu/sound/discrete.h @@ -1,5 +1,5 @@ -// license:??? -// copyright-holders:Keith Wilkins, Derrick Renaud, Frank Palazzolo, Couriersud +// license:BSD-3-Clause +// copyright-holders:K.Wilkins, Derrick Renaud, Frank Palazzolo, Couriersud #pragma once #ifndef __DISCRETE_H__ @@ -11,7 +11,7 @@ * * MAME - Discrete sound system emulation library * - * Written by Keith Wilkins (mame@esplexo.co.uk) + * Written by K.Wilkins (mame@esplexo.co.uk) * * (c) K.Wilkins 2000 * |