summaryrefslogtreecommitdiff
path: root/src/w_merge.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 /src/w_merge.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 'src/w_merge.c')
-rw-r--r--src/w_merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/w_merge.c b/src/w_merge.c
index 372b3583..6b6ae659 100644
--- a/src/w_merge.c
+++ b/src/w_merge.c
@@ -143,7 +143,7 @@ static void SetupLists(void)
SetupList(&pwad_sprites, &pwad, "S_START", "S_END", "SS_START", "SS_END");
}
-// Initialise the replace list
+// Initialize the replace list
static void InitSpriteList(void)
{