diff options
author | Simon Howard | 2009-11-21 16:36:46 +0000 |
---|---|---|
committer | Simon Howard | 2009-11-21 16:36:46 +0000 |
commit | afa0c4c7979c1508605d0e79487f299cd03adda6 (patch) | |
tree | 7df1745badf169e4490e3a56a89a28ac37977c14 /src/w_merge.c | |
parent | 095bc1110b3c11fbf2e17bfd51bf78909fe34662 (diff) | |
parent | 2c6e7b2f10c32ca0406ca6753e7701d83e6dea8f (diff) | |
download | chocolate-doom-afa0c4c7979c1508605d0e79487f299cd03adda6.tar.gz chocolate-doom-afa0c4c7979c1508605d0e79487f299cd03adda6.tar.bz2 chocolate-doom-afa0c4c7979c1508605d0e79487f299cd03adda6.zip |
Merge from trunk.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1737
Diffstat (limited to 'src/w_merge.c')
-rw-r--r-- | src/w_merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/w_merge.c b/src/w_merge.c index 8f5690c9..150f075c 100644 --- a/src/w_merge.c +++ b/src/w_merge.c @@ -144,7 +144,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) { |