summaryrefslogtreecommitdiff
path: root/src/w_merge.c
AgeCommit message (Expand)Author
2011-09-25Handle WAD merging correctly when the sprites list contains lumps withSimon Howard
2009-11-21Merge from trunk.Simon Howard
2009-09-30Change British English spellings to American English, for consistency.Simon Howard
2008-10-31- Delete the "all-in-one" project file and rename the solution file toRussell Rice
2008-09-06Remove includes of doomdef.h where possible, move generic parts into topSimon Howard
2008-05-02Add WAD I/O abstraction layer - first step for mmapped WAD access.Simon Howard
2008-01-16Added MSVC9 (2k8 Express) Project File; The client builds but -setup andGhostlyDeath
2006-10-18Shut up warnings in w_wad.c.Simon Howard
2006-10-18Strip out CVS logs, RCS Id tags.Simon Howard
2006-09-02Add -nwtmerge option, which behaves the same as NWT's -merge option. What thisSimon Howard
2006-02-03Support NWT-style WAD merging (-af and -as command line parameters).Simon Howard
2005-10-23Drastically refactor the WAD merging code. Allow multiple replacementsSimon Howard
2005-10-09Improved sprite mergingSimon Howard
2005-10-08WAD merging codeSimon Howard