summaryrefslogtreecommitdiff
path: root/setup/multiplayer.c
diff options
context:
space:
mode:
authorSimon Howard2009-10-01 01:10:17 +0000
committerSimon Howard2009-10-01 01:10:17 +0000
commit06c73f7a43b0b569c63fb1153e9f8da25f3ddfb7 (patch)
tree91532a8428caeba2c2ba3ba21b8299a5dfad79a5 /setup/multiplayer.c
parent4a70f989d2aacabffc2f02017704de042be7418a (diff)
parent508c3fd3fa5b3149d329e15ea3e072ad2a7aa2f2 (diff)
downloadchocolate-doom-06c73f7a43b0b569c63fb1153e9f8da25f3ddfb7.tar.gz
chocolate-doom-06c73f7a43b0b569c63fb1153e9f8da25f3ddfb7.tar.bz2
chocolate-doom-06c73f7a43b0b569c63fb1153e9f8da25f3ddfb7.zip
Merge from trunk.
Subversion-branch: /branches/opl-branch Subversion-revision: 1702
Diffstat (limited to 'setup/multiplayer.c')
-rw-r--r--setup/multiplayer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup/multiplayer.c b/setup/multiplayer.c
index ee46c3f1..c5d0d1e9 100644
--- a/setup/multiplayer.c
+++ b/setup/multiplayer.c
@@ -716,7 +716,7 @@ void SetChatMacroDefaults(void)
HUSTR_CHATMACRO0,
};
- // If the chat macros have not been set, initialise with defaults.
+ // If the chat macros have not been set, initialize with defaults.
for (i=0; i<10; ++i)
{