summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-04-30 05:23:07 +0000
committerSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-04-30 05:23:07 +0000
commit3adece8b48417154bcb6d6d0932db74458e6835c (patch)
tree3823a75a2f416c12bc35d00c81c408c36be8ae54
parenta14ac3d6c7f31a94c0fc732fb1e238b3ded332b2 (diff)
downloadpcsxr-3adece8b48417154bcb6d6d0932db74458e6835c.tar.gz
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@46936 e17a0e51-4ae3-4d35-97c3-1a29b211df97
-rw-r--r--ChangeLog5
-rw-r--r--gui/Cheat.c3
-rw-r--r--gui/Cheat.h3
-rw-r--r--gui/ConfDlg.c2
-rw-r--r--gui/ConfDlg.h2
-rw-r--r--gui/Config.c2
-rw-r--r--gui/DebugMemory.c3
-rw-r--r--gui/DebugMemory.h3
-rw-r--r--gui/Gtk2Gui.c2
-rw-r--r--gui/Linux.h2
-rw-r--r--gui/LnxMain.c2
-rw-r--r--gui/MemcardDlg.c2
-rw-r--r--gui/MemcardDlg.h2
-rw-r--r--gui/Plugin.c2
-rw-r--r--libpcsxcore/cdriso.c2
-rw-r--r--libpcsxcore/cdriso.h2
-rw-r--r--libpcsxcore/cdrom.c3
-rw-r--r--libpcsxcore/cdrom.h3
-rw-r--r--libpcsxcore/cheat.c3
-rw-r--r--libpcsxcore/cheat.h3
-rw-r--r--libpcsxcore/coff.h3
-rw-r--r--libpcsxcore/debug.h3
-rw-r--r--libpcsxcore/decode_xa.c3
-rw-r--r--libpcsxcore/decode_xa.h3
-rw-r--r--libpcsxcore/disr3000a.c3
-rw-r--r--libpcsxcore/gte.c39
-rw-r--r--libpcsxcore/gte.h36
-rw-r--r--libpcsxcore/ix86/iGte.h3
-rw-r--r--libpcsxcore/ix86/iR3000A.c3
-rw-r--r--libpcsxcore/ix86/ix86.c3
-rw-r--r--libpcsxcore/ix86/ix86.h3
-rw-r--r--libpcsxcore/ix86_64/iGte.h3
-rw-r--r--libpcsxcore/ix86_64/iR3000A-64.c3
-rw-r--r--libpcsxcore/ix86_64/ix86_cpudetect.c2
-rw-r--r--libpcsxcore/mdec.c2
-rw-r--r--libpcsxcore/mdec.h3
-rw-r--r--libpcsxcore/misc.c3
-rw-r--r--libpcsxcore/misc.h3
-rw-r--r--libpcsxcore/plugins.c3
-rw-r--r--libpcsxcore/plugins.h3
-rw-r--r--libpcsxcore/ppc/pGte.h2
-rw-r--r--libpcsxcore/ppc/pR3000A.c2
-rw-r--r--libpcsxcore/ppf.c3
-rw-r--r--libpcsxcore/ppf.h3
-rw-r--r--libpcsxcore/psxbios.c3
-rw-r--r--libpcsxcore/psxbios.h3
-rw-r--r--libpcsxcore/psxcommon.h3
-rw-r--r--libpcsxcore/psxcounters.c3
-rw-r--r--libpcsxcore/psxcounters.h3
-rw-r--r--libpcsxcore/psxdma.c3
-rw-r--r--libpcsxcore/psxdma.h3
-rw-r--r--libpcsxcore/psxhle.c3
-rw-r--r--libpcsxcore/psxhle.h3
-rw-r--r--libpcsxcore/psxhw.c3
-rw-r--r--libpcsxcore/psxhw.h3
-rw-r--r--libpcsxcore/psxinterpreter.c3
-rw-r--r--libpcsxcore/psxmem.c3
-rw-r--r--libpcsxcore/psxmem.h3
-rw-r--r--libpcsxcore/r3000a.c3
-rw-r--r--libpcsxcore/r3000a.h3
-rw-r--r--libpcsxcore/sio.c3
-rw-r--r--libpcsxcore/sio.h3
-rw-r--r--libpcsxcore/spu.c3
-rw-r--r--libpcsxcore/spu.h3
-rw-r--r--libpcsxcore/system.h3
-rw-r--r--win32/gui/AboutDlg.c2
-rw-r--r--win32/gui/AboutDlg.h2
-rw-r--r--win32/gui/CheatDlg.c3
-rw-r--r--win32/gui/ConfigurePlugins.c2
-rw-r--r--win32/gui/Win32.h2
-rw-r--r--win32/gui/WndMain.c2
-rw-r--r--win32/gui/plugin.c2
-rw-r--r--win32/gui/plugin.h50
-rw-r--r--win32/intl/bindtextdom.c2
-rw-r--r--win32/intl/dcgettext.c2
-rw-r--r--win32/intl/dgettext.c2
-rw-r--r--win32/intl/explodename.c2
-rw-r--r--win32/intl/finddomain.c2
-rw-r--r--win32/intl/gettext.c2
-rw-r--r--win32/intl/gettext.h2
-rw-r--r--win32/intl/gettextP.h2
-rw-r--r--win32/intl/hash-string.h2
-rw-r--r--win32/intl/intl-compat.c2
-rw-r--r--win32/intl/l10nflist.c2
-rw-r--r--win32/intl/libgettext.h2
-rw-r--r--win32/intl/libintl.h2
-rw-r--r--win32/intl/loadinfo.h2
-rw-r--r--win32/intl/loadmsgcat.c2
-rw-r--r--win32/intl/localealias.c2
-rw-r--r--win32/intl/textdomain.c2
90 files changed, 157 insertions, 193 deletions
diff --git a/ChangeLog b/ChangeLog
index 2665ac63..510bc05c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+April 30, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
+
+ * Mass update to the copyright headers. Fixed typo in FSF's address,
+ Removed obsolete URL. (No real change :) )
+
April 24, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
* win32/pcsx.rc: Don't include afxres.h, which doesn't exist in MSVC
diff --git a/gui/Cheat.c b/gui/Cheat.c
index 17cc7f0d..4047e2f2 100644
--- a/gui/Cheat.c
+++ b/gui/Cheat.c
@@ -1,5 +1,4 @@
/* Cheat Support for PCSX-Reloaded
- *
* Copyright (C) 2009, Wei Mingzhi <whistler_wmz@users.sf.net>.
*
* This program is free software; you can redistribute it and/or modify
@@ -14,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
*/
#include <stdio.h>
diff --git a/gui/Cheat.h b/gui/Cheat.h
index 62039118..f0990af1 100644
--- a/gui/Cheat.h
+++ b/gui/Cheat.h
@@ -1,5 +1,4 @@
/* Cheat Support for PCSX-Reloaded
- *
* Copyright (C) 2009, Wei Mingzhi <whistler@openoffice.org>.
*
* This program is free software; you can redistribute it and/or modify
@@ -14,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
*/
#ifndef GUI_CHEAT_H
diff --git a/gui/ConfDlg.c b/gui/ConfDlg.c
index 27e0b90e..a9c2a0d5 100644
--- a/gui/ConfDlg.c
+++ b/gui/ConfDlg.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
*/
#include <stdio.h>
diff --git a/gui/ConfDlg.h b/gui/ConfDlg.h
index 00e10c10..56afc28c 100644
--- a/gui/ConfDlg.h
+++ b/gui/ConfDlg.h
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
*/
#ifndef CONFDLG_H
diff --git a/gui/Config.c b/gui/Config.c
index 102f1b09..97b2d0a4 100644
--- a/gui/Config.c
+++ b/gui/Config.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
*/
#include <stdio.h>
diff --git a/gui/DebugMemory.c b/gui/DebugMemory.c
index cf5b5363..00fa5395 100644
--- a/gui/DebugMemory.c
+++ b/gui/DebugMemory.c
@@ -1,5 +1,4 @@
/* Memory Viewer/Dumper for PCSX-Reloaded
- *
* Copyright (C) 2010, Wei Mingzhi <whistler_wmz@users.sf.net>.
*
* This program is free software; you can redistribute it and/or modify
@@ -14,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
*/
#include "Linux.h"
diff --git a/gui/DebugMemory.h b/gui/DebugMemory.h
index 07277158..49673731 100644
--- a/gui/DebugMemory.h
+++ b/gui/DebugMemory.h
@@ -1,5 +1,4 @@
/* Memory Viewer/Dumper for PCSX-Reloaded
- *
* Copyright (C) 2010, Wei Mingzhi <whistler_wmz@users.sf.net>.
*
* This program is free software; you can redistribute it and/or modify
@@ -14,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
*/
#ifndef DEBUGMEMORY_H
diff --git a/gui/Gtk2Gui.c b/gui/Gtk2Gui.c
index 0b7ba584..9cca1b46 100644
--- a/gui/Gtk2Gui.c
+++ b/gui/Gtk2Gui.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
*/
#include <stdio.h>
diff --git a/gui/Linux.h b/gui/Linux.h
index 9a53ae93..15f5812a 100644
--- a/gui/Linux.h
+++ b/gui/Linux.h
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
*/
#ifndef __LINUX_H__
diff --git a/gui/LnxMain.c b/gui/LnxMain.c
index c0ff8e72..f9a66dd1 100644
--- a/gui/LnxMain.c
+++ b/gui/LnxMain.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
*/
#include "config.h"
diff --git a/gui/MemcardDlg.c b/gui/MemcardDlg.c
index f2167f75..94b03cf7 100644
--- a/gui/MemcardDlg.c
+++ b/gui/MemcardDlg.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
*/
#include <stdio.h>
diff --git a/gui/MemcardDlg.h b/gui/MemcardDlg.h
index ae583d6d..519283a2 100644
--- a/gui/MemcardDlg.h
+++ b/gui/MemcardDlg.h
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
*/
#ifndef MEMCARDDLG_H
diff --git a/gui/Plugin.c b/gui/Plugin.c
index 351ee778..ab4101b9 100644
--- a/gui/Plugin.c
+++ b/gui/Plugin.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
*/
#include <stdio.h>
diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c
index 13b7078a..597dbdfc 100644
--- a/libpcsxcore/cdriso.c
+++ b/libpcsxcore/cdriso.c
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
#include "psxcommon.h"
diff --git a/libpcsxcore/cdriso.h b/libpcsxcore/cdriso.h
index f263548f..98fec173 100644
--- a/libpcsxcore/cdriso.h
+++ b/libpcsxcore/cdriso.h
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
#ifndef CDRISO_H
diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index c2ac65a3..dfd9a2e4 100644
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/cdrom.h b/libpcsxcore/cdrom.h
index 64ee73f4..f817a8f4 100644
--- a/libpcsxcore/cdrom.h
+++ b/libpcsxcore/cdrom.h
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
#ifndef __CDROM_H__
diff --git a/libpcsxcore/cheat.c b/libpcsxcore/cheat.c
index d743e145..053d3256 100644
--- a/libpcsxcore/cheat.c
+++ b/libpcsxcore/cheat.c
@@ -1,5 +1,4 @@
/* Cheat Support for PCSX-Reloaded
- *
* Copyright (c) 2009, Wei Mingzhi <whistler_wmz@users.sf.net>.
*
* This program is free software; you can redistribute it and/or modify
@@ -14,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
*/
#include "psxcommon.h"
diff --git a/libpcsxcore/cheat.h b/libpcsxcore/cheat.h
index c5c74cd7..7306f70c 100644
--- a/libpcsxcore/cheat.h
+++ b/libpcsxcore/cheat.h
@@ -1,5 +1,4 @@
/* Cheat Support for PCSX-Reloaded
- *
* Copyright (C) 2009, Wei Mingzhi <whistler_wmz@users.sf.net>.
*
* This program is free software; you can redistribute it and/or modify
@@ -14,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
*/
#ifndef CHEAT_H
diff --git a/libpcsxcore/coff.h b/libpcsxcore/coff.h
index 74f3dc41..e7a98ab8 100644
--- a/libpcsxcore/coff.h
+++ b/libpcsxcore/coff.h
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
#ifndef __COFF_H__
diff --git a/libpcsxcore/debug.h b/libpcsxcore/debug.h
index 7d282a58..2e073721 100644
--- a/libpcsxcore/debug.h
+++ b/libpcsxcore/debug.h
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
#ifndef __DEBUG_H__
diff --git a/libpcsxcore/decode_xa.c b/libpcsxcore/decode_xa.c
index 385c0571..ee1dd6f3 100644
--- a/libpcsxcore/decode_xa.c
+++ b/libpcsxcore/decode_xa.c
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/decode_xa.h b/libpcsxcore/decode_xa.h
index 2fc71140..bdf1f843 100644
--- a/libpcsxcore/decode_xa.h
+++ b/libpcsxcore/decode_xa.h
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
#ifndef __DECODE_XA_H__
diff --git a/libpcsxcore/disr3000a.c b/libpcsxcore/disr3000a.c
index 3314df88..23667c1a 100644
--- a/libpcsxcore/disr3000a.c
+++ b/libpcsxcore/disr3000a.c
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/gte.c b/libpcsxcore/gte.c
index ca96d8f7..3d2ecdc9 100644
--- a/libpcsxcore/gte.c
+++ b/libpcsxcore/gte.c
@@ -1,19 +1,23 @@
-/* PCSX-Revolution - PS Emulator for Nintendo Wii
- * Copyright (C) 2009-2010 PCSX-Revolution Dev Team
- *
- * PCSX-Revolution 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, either version 2 of the
- * License, or (at your option) any later version.
- *
- * PCSX-Revolution 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 for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with PCSX-Revolution. If not, see <http://www.gnu.org/licenses/>.
- */
+/***************************************************************************
+ * PCSX-Revolution - PlayStation Emulator for Nintendo Wii *
+ * Copyright (C) 2009-2010 PCSX-Revolution Dev Team *
+ * <http://code.google.com/p/pcsx-revolution/> *
+ * *
+ * 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; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * 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 for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ ***************************************************************************/
/*
* GTE functions.
@@ -161,9 +165,8 @@
#define GTE_LM(op) ((op >> 10) & 1)
#define GTE_CT(op) ((op >> 6) & 15) /* not used */
#define GTE_FUNCT(op) (op & 63)
-#define INS_COFUN(op) (op & 0x1ffffff)
-#define gteop (INS_COFUN(psxRegs.code))
+#define gteop (psxRegs.code & 0x1ffffff)
static inline s64 BOUNDS(s64 n_value, s64 n_max, int n_maxflag, s64 n_min, int n_minflag) {
if (n_value > n_max) {
diff --git a/libpcsxcore/gte.h b/libpcsxcore/gte.h
index a1bae57e..28a36355 100644
--- a/libpcsxcore/gte.h
+++ b/libpcsxcore/gte.h
@@ -1,19 +1,23 @@
-/* PCSX-Revolution - PS Emulator for Nintendo Wii
- * Copyright (C) 2009-2010 PCSX-Revolution Dev Team
- *
- * PCSX-Revolution 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, either version 2 of the
- * License, or (at your option) any later version.
- *
- * PCSX-Revolution 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 for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with PCSX-Revolution. If not, see <http://www.gnu.org/licenses/>.
- */
+/***************************************************************************
+ * PCSX-Revolution - PlayStation Emulator for Nintendo Wii *
+ * Copyright (C) 2009-2010 PCSX-Revolution Dev Team *
+ * <http://code.google.com/p/pcsx-revolution/> *
+ * *
+ * 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; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * 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 for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ ***************************************************************************/
#ifndef __GTE_H__
#define __GTE_H__
diff --git a/libpcsxcore/ix86/iGte.h b/libpcsxcore/ix86/iGte.h
index 17b3b3bc..0847e368 100644
--- a/libpcsxcore/ix86/iGte.h
+++ b/libpcsxcore/ix86/iGte.h
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
#ifndef __IGTE_H__
diff --git a/libpcsxcore/ix86/iR3000A.c b/libpcsxcore/ix86/iR3000A.c
index b5629bd8..f3e4058f 100644
--- a/libpcsxcore/ix86/iR3000A.c
+++ b/libpcsxcore/ix86/iR3000A.c
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/ix86/ix86.c b/libpcsxcore/ix86/ix86.c
index 9350f170..763552e8 100644
--- a/libpcsxcore/ix86/ix86.c
+++ b/libpcsxcore/ix86/ix86.c
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/ix86/ix86.h b/libpcsxcore/ix86/ix86.h
index 8a5550ee..3ace6122 100644
--- a/libpcsxcore/ix86/ix86.h
+++ b/libpcsxcore/ix86/ix86.h
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/ix86_64/iGte.h b/libpcsxcore/ix86_64/iGte.h
index c0022e79..af20bfc9 100644
--- a/libpcsxcore/ix86_64/iGte.h
+++ b/libpcsxcore/ix86_64/iGte.h
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
#ifndef __IGTE_H__
diff --git a/libpcsxcore/ix86_64/iR3000A-64.c b/libpcsxcore/ix86_64/iR3000A-64.c
index 326ee938..2a636cfc 100644
--- a/libpcsxcore/ix86_64/iR3000A-64.c
+++ b/libpcsxcore/ix86_64/iR3000A-64.c
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/ix86_64/ix86_cpudetect.c b/libpcsxcore/ix86_64/ix86_cpudetect.c
index f34292a6..3c014d89 100644
--- a/libpcsxcore/ix86_64/ix86_cpudetect.c
+++ b/libpcsxcore/ix86_64/ix86_cpudetect.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
*/
#if defined (_WIN32)
#include <windows.h>
diff --git a/libpcsxcore/mdec.c b/libpcsxcore/mdec.c
index 64a3f4dd..4e8c409a 100644
--- a/libpcsxcore/mdec.c
+++ b/libpcsxcore/mdec.c
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
#include "mdec.h"
diff --git a/libpcsxcore/mdec.h b/libpcsxcore/mdec.h
index f45c4b45..53ed93c7 100644
--- a/libpcsxcore/mdec.h
+++ b/libpcsxcore/mdec.h
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
#ifndef __MDEC_H__
diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c
index 30c7351d..7d773b96 100644
--- a/libpcsxcore/misc.c
+++ b/libpcsxcore/misc.c
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/misc.h b/libpcsxcore/misc.h
index a71dfecd..960e7d28 100644
--- a/libpcsxcore/misc.h
+++ b/libpcsxcore/misc.h
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
#ifndef __MISC_H__
diff --git a/libpcsxcore/plugins.c b/libpcsxcore/plugins.c
index 6717f216..fd103d87 100644
--- a/libpcsxcore/plugins.c
+++ b/libpcsxcore/plugins.c
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/plugins.h b/libpcsxcore/plugins.h
index a6de52f5..017f28eb 100644
--- a/libpcsxcore/plugins.h
+++ b/libpcsxcore/plugins.h
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
#ifndef __PLUGINS_H__
diff --git a/libpcsxcore/ppc/pGte.h b/libpcsxcore/ppc/pGte.h
index b0edd4c3..3f109fef 100644
--- a/libpcsxcore/ppc/pGte.h
+++ b/libpcsxcore/ppc/pGte.h
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
*/
int psxCP2time[64] = {
diff --git a/libpcsxcore/ppc/pR3000A.c b/libpcsxcore/ppc/pR3000A.c
index 60225f98..7d1628ae 100644
--- a/libpcsxcore/ppc/pR3000A.c
+++ b/libpcsxcore/ppc/pR3000A.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
*/
#ifdef _MSC_VER_
diff --git a/libpcsxcore/ppf.c b/libpcsxcore/ppf.c
index cd33f92c..ebda4f8a 100644
--- a/libpcsxcore/ppf.c
+++ b/libpcsxcore/ppf.c
@@ -1,5 +1,4 @@
/* PPF Patch Support for PCSX-Reloaded
- *
* Copyright (c) 2009, Wei Mingzhi <whistler_wmz@users.sf.net>.
*
* Based on P.E.Op.S CDR Plugin by Pete Bernert.
@@ -17,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
*/
#include "psxcommon.h"
diff --git a/libpcsxcore/ppf.h b/libpcsxcore/ppf.h
index 85ccd453..d57a9301 100644
--- a/libpcsxcore/ppf.h
+++ b/libpcsxcore/ppf.h
@@ -1,5 +1,4 @@
/* PPF Patch Support for PCSX-Reloaded
- *
* Copyright (c) 2009, Wei Mingzhi <whistler_wmz@users.sf.net>.
*
* This program is free software; you can redistribute it and/or modify
@@ -14,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
*/
#ifndef __PPF_H__
diff --git a/libpcsxcore/psxbios.c b/libpcsxcore/psxbios.c
index c6a6a050..f281878a 100644
--- a/libpcsxcore/psxbios.c
+++ b/libpcsxcore/psxbios.c
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/psxbios.h b/libpcsxcore/psxbios.h
index 86d22663..6f29d351 100644
--- a/libpcsxcore/psxbios.h
+++ b/libpcsxcore/psxbios.h
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
#ifndef __PSXBIOS_H__
diff --git a/libpcsxcore/psxcommon.h b/libpcsxcore/psxcommon.h
index b2ea8048..931cdc93 100644
--- a/libpcsxcore/psxcommon.h
+++ b/libpcsxcore/psxcommon.h
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c
index ef61f9e0..34710299 100644
--- a/libpcsxcore/psxcounters.c
+++ b/libpcsxcore/psxcounters.c
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/psxcounters.h b/libpcsxcore/psxcounters.h
index de7a5cdd..c292b679 100644
--- a/libpcsxcore/psxcounters.h
+++ b/libpcsxcore/psxcounters.h
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
#ifndef __PSXCOUNTERS_H__
diff --git a/libpcsxcore/psxdma.c b/libpcsxcore/psxdma.c
index 1a004d8f..7a1d2ae0 100644
--- a/libpcsxcore/psxdma.c
+++ b/libpcsxcore/psxdma.c
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/psxdma.h b/libpcsxcore/psxdma.h
index 404aee06..04457268 100644
--- a/libpcsxcore/psxdma.h
+++ b/libpcsxcore/psxdma.h
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
#ifndef __PSXDMA_H__
diff --git a/libpcsxcore/psxhle.c b/libpcsxcore/psxhle.c
index 816e94bc..83362ecd 100644
--- a/libpcsxcore/psxhle.c
+++ b/libpcsxcore/psxhle.c
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/psxhle.h b/libpcsxcore/psxhle.h
index 16b37c86..1c100ac7 100644
--- a/libpcsxcore/psxhle.h
+++ b/libpcsxcore/psxhle.h
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
#ifndef __PSXHLE_H__
diff --git a/libpcsxcore/psxhw.c b/libpcsxcore/psxhw.c
index c20936b4..5b1e6963 100644
--- a/libpcsxcore/psxhw.c
+++ b/libpcsxcore/psxhw.c
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/psxhw.h b/libpcsxcore/psxhw.h
index 92c66f90..43f70763 100644
--- a/libpcsxcore/psxhw.h
+++ b/libpcsxcore/psxhw.h
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
#ifndef __PSXHW_H__
diff --git a/libpcsxcore/psxinterpreter.c b/libpcsxcore/psxinterpreter.c
index ff5d41b1..ba4104ad 100644
--- a/libpcsxcore/psxinterpreter.c
+++ b/libpcsxcore/psxinterpreter.c
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index 0b276bfc..053fc58f 100644
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/psxmem.h b/libpcsxcore/psxmem.h
index ba880ed5..0af77f5c 100644
--- a/libpcsxcore/psxmem.h
+++ b/libpcsxcore/psxmem.h
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
#ifndef __PSXMEMORY_H__
diff --git a/libpcsxcore/r3000a.c b/libpcsxcore/r3000a.c
index c0b163bb..24d12adf 100644
--- a/libpcsxcore/r3000a.c
+++ b/libpcsxcore/r3000a.c
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/r3000a.h b/libpcsxcore/r3000a.h
index 4d62fd40..5e9849aa 100644
--- a/libpcsxcore/r3000a.h
+++ b/libpcsxcore/r3000a.h
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
#ifndef __R3000A_H__
diff --git a/libpcsxcore/sio.c b/libpcsxcore/sio.c
index 3fb4b177..c3293ef4 100644
--- a/libpcsxcore/sio.c
+++ b/libpcsxcore/sio.c
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/sio.h b/libpcsxcore/sio.h
index 082c5447..df6ddda3 100644
--- a/libpcsxcore/sio.h
+++ b/libpcsxcore/sio.h
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
diff --git a/libpcsxcore/spu.c b/libpcsxcore/spu.c
index b78b5adc..82f04596 100644
--- a/libpcsxcore/spu.c
+++ b/libpcsxcore/spu.c
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/spu.h b/libpcsxcore/spu.h
index 12a8e475..27200255 100644
--- a/libpcsxcore/spu.h
+++ b/libpcsxcore/spu.h
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
#ifndef __SPU_H__
diff --git a/libpcsxcore/system.h b/libpcsxcore/system.h
index 124a1cd6..1a2142c1 100644
--- a/libpcsxcore/system.h
+++ b/libpcsxcore/system.h
@@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
* *
* 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 *
@@ -15,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
#ifndef __SYSTEM_H__
diff --git a/win32/gui/AboutDlg.c b/win32/gui/AboutDlg.c
index bcf0bde0..9f930ba4 100644
--- a/win32/gui/AboutDlg.c
+++ b/win32/gui/AboutDlg.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
*/
#include <windows.h>
diff --git a/win32/gui/AboutDlg.h b/win32/gui/AboutDlg.h
index 75f06456..a6fb136c 100644
--- a/win32/gui/AboutDlg.h
+++ b/win32/gui/AboutDlg.h
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
*/
#ifndef _PCSX_ABOUTDLG_H_
diff --git a/win32/gui/CheatDlg.c b/win32/gui/CheatDlg.c
index 88927e28..a09587a6 100644
--- a/win32/gui/CheatDlg.c
+++ b/win32/gui/CheatDlg.c
@@ -1,5 +1,4 @@
/* Cheat Support for PCSX-Reloaded
- *
* Copyright (C) 2009, Wei Mingzhi <whistler_wmz@users.sf.net>.
*
* This program is free software; you can redistribute it and/or modify
@@ -14,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
*/
#include <windows.h>
diff --git a/win32/gui/ConfigurePlugins.c b/win32/gui/ConfigurePlugins.c
index 1b2e19d1..a9951016 100644
--- a/win32/gui/ConfigurePlugins.c
+++ b/win32/gui/ConfigurePlugins.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
*/
#include <windows.h>
diff --git a/win32/gui/Win32.h b/win32/gui/Win32.h
index 805d6de4..39aa59f3 100644
--- a/win32/gui/Win32.h
+++ b/win32/gui/Win32.h
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
*/
#ifndef __WIN32_H__
diff --git a/win32/gui/WndMain.c b/win32/gui/WndMain.c
index 45d8b447..7a86e9ac 100644
--- a/win32/gui/WndMain.c
+++ b/win32/gui/WndMain.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
*/
#include <windows.h>
diff --git a/win32/gui/plugin.c b/win32/gui/plugin.c
index 8ae075ad..93942ca4 100644
--- a/win32/gui/plugin.c
+++ b/win32/gui/plugin.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
*/
#include <windows.h>
diff --git a/win32/gui/plugin.h b/win32/gui/plugin.h
index c03a8a5b..048dc3eb 100644
--- a/win32/gui/plugin.h
+++ b/win32/gui/plugin.h
@@ -1,27 +1,27 @@
-/* Pcsx - Pc Psx Emulator
- * Copyright (C) 1999-2003 Pcsx Team
- *
- * 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; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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 for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
- */
-
-// Windows Specific Plugin Functions
-#ifndef __PLUGIN_H__
-#define __PLUGIN_H__
+/* Pcsx - Pc Psx Emulator
+ * Copyright (C) 1999-2003 Pcsx Team
+ *
+ * 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; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
+ */
+
+// Windows Specific Plugin Functions
+#ifndef __PLUGIN_H__
+#define __PLUGIN_H__
#include "plugins.h"
-
-void GetStateFilename(char *out, int i);
-
-#endif /* __PLUGIN_H__ */
+
+void GetStateFilename(char *out, int i);
+
+#endif /* __PLUGIN_H__ */
diff --git a/win32/intl/bindtextdom.c b/win32/intl/bindtextdom.c
index ae266d6d..67b5742d 100644
--- a/win32/intl/bindtextdom.c
+++ b/win32/intl/bindtextdom.c
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. */
#include "intlconfig.h"
diff --git a/win32/intl/dcgettext.c b/win32/intl/dcgettext.c
index 344f85a7..64811b1e 100644
--- a/win32/intl/dcgettext.c
+++ b/win32/intl/dcgettext.c
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. */
#include "intlconfig.h"
diff --git a/win32/intl/dgettext.c b/win32/intl/dgettext.c
index ced30d37..264bba38 100644
--- a/win32/intl/dgettext.c
+++ b/win32/intl/dgettext.c
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. */
#include <intlconfig.h>
diff --git a/win32/intl/explodename.c b/win32/intl/explodename.c
index 8179ac40..a4f88c26 100644
--- a/win32/intl/explodename.c
+++ b/win32/intl/explodename.c
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. */
#include "intlconfig.h"
diff --git a/win32/intl/finddomain.c b/win32/intl/finddomain.c
index 3c04aabb..9d856e4b 100644
--- a/win32/intl/finddomain.c
+++ b/win32/intl/finddomain.c
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. */
#include "intlconfig.h"
diff --git a/win32/intl/gettext.c b/win32/intl/gettext.c
index 5c91adc7..b0f69a7b 100644
--- a/win32/intl/gettext.c
+++ b/win32/intl/gettext.c
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. */
#include "intlconfig.h"
diff --git a/win32/intl/gettext.h b/win32/intl/gettext.h
index 057e0226..9108a2ed 100644
--- a/win32/intl/gettext.h
+++ b/win32/intl/gettext.h
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public
License along with this program; see the file COPYING. If not,
- write to the Free Software Foundation, Inc., 51 Franklin Steet,
+ write to the Free Software Foundation, Inc., 51 Franklin Street,
Fifth Floor, Boston, MA 02111-1307 USA. */
#ifndef _GETTEXT_H
diff --git a/win32/intl/gettextP.h b/win32/intl/gettextP.h
index 05d1eaaa..87b076c3 100644
--- a/win32/intl/gettextP.h
+++ b/win32/intl/gettextP.h
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. */
#ifndef _GETTEXTP_H
#define _GETTEXTP_H
diff --git a/win32/intl/hash-string.h b/win32/intl/hash-string.h
index 19aa475b..9bb0014f 100644
--- a/win32/intl/hash-string.h
+++ b/win32/intl/hash-string.h
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public
License along with the this program; see the file COPYING. If not,
- write to the Free Software Foundation, Inc., 51 Franklin Steet,
+ write to the Free Software Foundation, Inc., 51 Franklin Street,
Fifth Floor, Boston, MA 02111-1307 USA. */
/* @@ end of prolog @@ */
diff --git a/win32/intl/intl-compat.c b/win32/intl/intl-compat.c
index 20d41b29..5f90dab4 100644
--- a/win32/intl/intl-compat.c
+++ b/win32/intl/intl-compat.c
@@ -14,7 +14,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. */
#include "intlconfig.h"
diff --git a/win32/intl/l10nflist.c b/win32/intl/l10nflist.c
index bf34bd23..d2c32df7 100644
--- a/win32/intl/l10nflist.c
+++ b/win32/intl/l10nflist.c
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. */
#include "intlconfig.h"
diff --git a/win32/intl/libgettext.h b/win32/intl/libgettext.h
index 3070ab7c..de4defd3 100644
--- a/win32/intl/libgettext.h
+++ b/win32/intl/libgettext.h
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. */
/* Because on some systems (e.g. Solaris) we sometimes have to include
the systems libintl.h as well as this file we have more complex
diff --git a/win32/intl/libintl.h b/win32/intl/libintl.h
index 1451bbb3..1dcc6af5 100644
--- a/win32/intl/libintl.h
+++ b/win32/intl/libintl.h
@@ -16,7 +16,7 @@ GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. */
/* REPLACEMENT FOR ORIGINAL LIBINTL.H for use with Windows32 */
diff --git a/win32/intl/loadinfo.h b/win32/intl/loadinfo.h
index 71534a7b..48326e97 100644
--- a/win32/intl/loadinfo.h
+++ b/win32/intl/loadinfo.h
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. */
#ifndef PARAMS
# if __STDC__
diff --git a/win32/intl/loadmsgcat.c b/win32/intl/loadmsgcat.c
index 3e9b83a8..57d148c3 100644
--- a/win32/intl/loadmsgcat.c
+++ b/win32/intl/loadmsgcat.c
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. */
#include "intlconfig.h"
diff --git a/win32/intl/localealias.c b/win32/intl/localealias.c
index 76fb8882..dfdb8486 100644
--- a/win32/intl/localealias.c
+++ b/win32/intl/localealias.c
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. */
#include "intlconfig.h"
diff --git a/win32/intl/textdomain.c b/win32/intl/textdomain.c
index 5460724f..8ec2fd85 100644
--- a/win32/intl/textdomain.c
+++ b/win32/intl/textdomain.c
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. */
#include "intlconfig.h"