diff options
| author | Simon Howard | 2006-10-18 00:51:11 +0000 |
|---|---|---|
| committer | Simon Howard | 2006-10-18 00:51:11 +0000 |
| commit | 7bd51fba5891163c6b0e615b4e010c692f792475 (patch) | |
| tree | a5a2a70d8fd4e8684f97d9e88cb75c4a11d43661 /src/w_merge.h | |
| parent | 058f7712fabe3d72939765f652b6b93614b478cd (diff) | |
| download | chocolate-doom-7bd51fba5891163c6b0e615b4e010c692f792475.tar.gz chocolate-doom-7bd51fba5891163c6b0e615b4e010c692f792475.tar.bz2 chocolate-doom-7bd51fba5891163c6b0e615b4e010c692f792475.zip | |
Strip out CVS logs, RCS Id tags.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 704
Diffstat (limited to 'src/w_merge.h')
| -rw-r--r-- | src/w_merge.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/w_merge.h b/src/w_merge.h index fae6c4e9..f7a4f40c 100644 --- a/src/w_merge.h +++ b/src/w_merge.h @@ -1,8 +1,6 @@ // Emacs style mode select -*- C++ -*- //----------------------------------------------------------------------------- // -// $Id: w_merge.h 596 2006-09-02 19:10:07Z fraggle $ -// // Copyright(C) 2005 Simon Howard // // This program is free software; you can redistribute it and/or @@ -20,16 +18,6 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA // 02111-1307, USA. // -// $Log$ -// Revision 1.2 2006/02/03 18:41:26 fraggle -// Support NWT-style WAD merging (-af and -as command line parameters). -// Restructure WAD loading so that merged WADs are always loaded before -// normal PWADs. Remove W_InitMultipleFiles(). -// -// Revision 1.1 2005/10/08 18:23:18 fraggle -// WAD merging code -// -// // DESCRIPTION: // Handles merging of PWADs, similar to deutex's -merge option // |