summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2011-06-01 13:53:11 +0000
committerSND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2011-06-01 13:53:11 +0000
commitc7eb23ccf1813fb4ca47c309c40baff308151237 (patch)
tree25eedc0e250ccb97a53ee8a2d1f1b6723288b9cf
parent148d5d830c96977d7aa5896f18554af7a78bf300 (diff)
downloadpcsxr-c7eb23ccf1813fb4ca47c309c40baff308151237.tar.gz
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@67260 e17a0e51-4ae3-4d35-97c3-1a29b211df97
-rw-r--r--debian-upstream/copyright1
-rw-r--r--doc/pcsx.12
-rw-r--r--win32/gui/AboutDlg.c2
3 files changed, 3 insertions, 2 deletions
diff --git a/debian-upstream/copyright b/debian-upstream/copyright
index 411fcbdf..3b8d85cc 100644
--- a/debian-upstream/copyright
+++ b/debian-upstream/copyright
@@ -6,6 +6,7 @@ It was downloaded from <http://www.codeplex.com/pcsxr>
Upstream Authors:
PCSX-Reloaded:
Wei Mingzhi <weimingzhi@gmail.com>
+ edgbla <edgbla@yandex.ru>
PCSX-df:
Stephen Chao <stephen@digitalnexus.org>
Ryan Schultz <schultz.ryan@gmail.com>
diff --git a/doc/pcsx.1 b/doc/pcsx.1
index 25d9cc50..27d86e08 100644
--- a/doc/pcsx.1
+++ b/doc/pcsx.1
@@ -31,5 +31,5 @@ Loads savestate STATENUM
Display help message
.TP
.SH AUTHOR
-pcsx was written by Linuzappz <linuzappz@pcsx.net>. PCSX-df was written by Ryan Schultz <schultz.ryan@gmail.com> and Andrew Burton <adb@iinet.net.au>.
+pcsx was written by Linuzappz <linuzappz@pcsx.net>. PCSX-df was written by Ryan Schultz <schultz.ryan@gmail.com> and Andrew Burton <adb@iinet.net.au>. PCSX-Reloaded was written by Wei Mingzhi <weimingzhi@gmail.com>.
This manual page was written by Ryan Schultz <schultz.ryan@gmail.com> for the Debian Project.
diff --git a/win32/gui/AboutDlg.c b/win32/gui/AboutDlg.c
index 59c10d14..7abae3d7 100644
--- a/win32/gui/AboutDlg.c
+++ b/win32/gui/AboutDlg.c
@@ -36,7 +36,7 @@ char *LabelGreets = { N_(
"Ryan Schultz, Andrew Burton, Stephen Chao,\n"
"Marcus Comstedt, Stefan Sikora\n\n"
"PCSX-Reloaded By:\n"
- "Blade_Arma, shalma, Wei Mingzhi, et al.\n\n"
+ "edgbla, shalma, Wei Mingzhi, et al.\n\n"
"http://pcsxr.codeplex.com/")
};