diff options
| author | Matthew Parlane <parlane@gmail.com> | 2013-04-24 00:48:00 +1200 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2013-04-24 00:48:00 +1200 |
| commit | 934e150596c30d7d1f74c208f90d741b23456e21 (patch) | |
| tree | e77b95dd17aeb3cd2b6118961f4b2a15f0cc956f /Source/Core/VideoCommon/Src/CommandProcessor.cpp | |
| parent | b652f1974f27b181f206d264831fc4685c984e1c (diff) | |
| parent | 9a50d055a1101ae5f2143c83889b51916cb16fbf (diff) | |
Merge branch 'master' into wii-network
Conflicts:
Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
Source/Core/Core/Src/ConfigManager.cpp
Source/Core/Core/Src/HLE/HLE_OS.h
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.h
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.h
Diffstat (limited to 'Source/Core/VideoCommon/Src/CommandProcessor.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/Src/CommandProcessor.cpp | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.cpp b/Source/Core/VideoCommon/Src/CommandProcessor.cpp index 733c99df69..24ac10c5bb 100644 --- a/Source/Core/VideoCommon/Src/CommandProcessor.cpp +++ b/Source/Core/VideoCommon/Src/CommandProcessor.cpp @@ -1,19 +1,6 @@ -// Copyright (C) 2003 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. #include "Common.h" #include "VideoCommon.h" |