diff options
Diffstat (limited to 'src/w_merge.c')
| -rw-r--r-- | src/w_merge.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/w_merge.c b/src/w_merge.c index e7ba224f..ae0975b6 100644 --- a/src/w_merge.c +++ b/src/w_merge.c @@ -1,7 +1,5 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- // -// Copyright(C) 2005 Simon Howard +// Copyright(C) 2005-2014 Simon Howard // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -13,18 +11,12 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -// 02111-1307, USA. -// // DESCRIPTION: // Handles merging of PWADs, similar to deutex's -merge option // // Ideally this should work exactly the same as in deutex, but trying to // read the deutex source code made my brain hurt. // -//----------------------------------------------------------------------------- #include <stdio.h> #include <stdlib.h> |