From 7bd51fba5891163c6b0e615b4e010c692f792475 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Wed, 18 Oct 2006 00:51:11 +0000
Subject: Strip out CVS logs, RCS Id tags.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 704
---
 src/w_merge.h | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'src/w_merge.h')

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
 //
-- 
cgit v1.2.3