diff options
| author | Dolphin Bot <dolphin-emu-bot@users.noreply.github.com> | 2015-05-25 13:47:34 +0200 |
|---|---|---|
| committer | Dolphin Bot <dolphin-emu-bot@users.noreply.github.com> | 2015-05-25 13:47:34 +0200 |
| commit | 5e58d178e08ddf7115c991a6462ff73159d9e453 (patch) | |
| tree | da3f167c589808d403b85560b81935d623f8c753 /Source/Core/InputCommon/ControllerInterface/DInput | |
| parent | 732802ebd025675c4b257a5c79d49dd8d2597bb1 (diff) | |
| parent | 30ebb2459eb97ba544547183854775df8460b475 (diff) | |
Merge pull request #1826 from Tilka/gplv2+
Relicense Dolphin under GPLv2+
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/DInput')
10 files changed, 24 insertions, 16 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp index aac795d880..4a68474618 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp @@ -1,5 +1,5 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 +// Copyright 2010 Dolphin Emulator Project +// Licensed under GPLv2+ // Refer to the license.txt file included. #include "Common/StringUtil.h" diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h index 84f9832c53..1823499e98 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h @@ -1,5 +1,5 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 +// Copyright 2010 Dolphin Emulator Project +// Licensed under GPLv2+ // Refer to the license.txt file included. #pragma once diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInput8.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInput8.h index 8845b5740e..4a32edb632 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInput8.h +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInput8.h @@ -1,5 +1,5 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 +// Copyright 2008 Dolphin Emulator Project +// Licensed under GPLv2+ // Refer to the license.txt file included. #pragma once diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp index bc8638293e..aa1e972126 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp @@ -1,5 +1,5 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 +// Copyright 2010 Dolphin Emulator Project +// Licensed under GPLv2+ // Refer to the license.txt file included. #include <algorithm> diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h index f1af8102cd..c89ba509d3 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h @@ -1,5 +1,5 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 +// Copyright 2010 Dolphin Emulator Project +// Licensed under GPLv2+ // Refer to the license.txt file included. #pragma once diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp index af4e3f0981..6db8a86a3a 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp @@ -1,5 +1,5 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 +// Copyright 2010 Dolphin Emulator Project +// Licensed under GPLv2+ // Refer to the license.txt file included. #include <algorithm> diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h index 704635057e..db4d363df0 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h @@ -1,5 +1,5 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 +// Copyright 2010 Dolphin Emulator Project +// Licensed under GPLv2+ // Refer to the license.txt file included. #pragma once diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/NamedKeys.h b/Source/Core/InputCommon/ControllerInterface/DInput/NamedKeys.h index 43e090dbeb..6802fd7888 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/NamedKeys.h +++ b/Source/Core/InputCommon/ControllerInterface/DInput/NamedKeys.h @@ -1,3 +1,7 @@ +// Copyright 2010 Dolphin Emulator Project +// Licensed under GPLv2+ +// Refer to the license.txt file included. + { DIK_A, "A" }, { DIK_B, "B" }, { DIK_C, "C" }, diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.cpp index a9a6c33918..aedfc5dc44 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.cpp @@ -1,5 +1,5 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2+ // Refer to the license.txt file included. // This function is contained in a separate file because WbemIdl.h pulls in files which break on diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.h b/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.h index 1dcc1141bf..6506dd156e 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.h +++ b/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.h @@ -1,3 +1,7 @@ +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2+ +// Refer to the license.txt file included. + #pragma once #include <vector> |