summaryrefslogtreecommitdiff
path: root/src/w_merge.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/w_merge.h')
-rw-r--r--src/w_merge.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/w_merge.h b/src/w_merge.h
index 00f127c5..fae6c4e9 100644
--- a/src/w_merge.h
+++ b/src/w_merge.h
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: w_merge.h 362 2006-02-03 18:41:26Z fraggle $
+// $Id: w_merge.h 596 2006-09-02 19:10:07Z fraggle $
//
// Copyright(C) 2005 Simon Howard
//
@@ -52,5 +52,13 @@ void W_MergeFile(char *filename);
void W_NWTMergeFile(char *filename, int flags);
+// Acts the same as NWT's "-merge" option.
+
+void W_NWTDashMerge(char *filename);
+
+// Debug function that prints the WAD directory.
+
+void W_PrintDirectory(void);
+
#endif /* #ifndef W_MERGE_H */