ref: 55d3b7cd205593e3a2bbc8654c291c339ba15cc2
parent: c8d319222d67bfd848b8770fa050883ef590cb10
parent: 5c7b6231d2a5316a356261df69db079b56ddfba0
author: Fabian Greffrath <fabian@greffrath.com>
date: Sat Jan 22 02:36:21 EST 2022
Merge pull request #1433 from chocolate-doom/setup-merge Change setup tool to use -merge instead of -file.
--- a/src/setup/multiplayer.c
+++ b/src/setup/multiplayer.c
@@ -175,7 +175,7 @@
{
if (!have_wads)
{
- AddCmdLineParameter(exec, "-file");
+ AddCmdLineParameter(exec, "-merge");
have_wads = 1;
}