Merge branch 'master' into stable

1 files changed, 4 insertions, 17 deletions

diff --git a/Source/DSPSpy/dsp_interface.cpp b/Source/DSPSpy/dsp_interface.cpp
index 5a935f12ef..f960b6d6f0 100644
--- a/Source/DSPSpy/dsp_interface.cpp
+++ b/Source/DSPSpy/dsp_interface.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 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
 
 #include "dsp_interface.h"
 
@@ -23,7 +10,7 @@ void IDSP::SendTask(void *addr, u16 iram_addr, u16 len, u16 start)
 	// iram_addr	dsp addr				4byte aligned (2 DSP words)
 	// len			block length in bytes	multiple of 4 (wtf? if you want to fill whole iram, you need 8191)
 	//											(8191 % 4 = 3) wtffff
-	// start		dsp iram entry point	
+	// start		dsp iram entry point
 	while (CheckMailTo());
 	SendMailTo(0x80F3A001);
 	while (CheckMailTo());