Fix improperly resolved conflicts
This commit is contained in:
1 parent
ad01dcc5ac
commit
e528750444
2 files changed
+6
-2
No files matched your search
+5
-2
@@ -1852,8 +1852,11 @@ static boolean CV_Command(void)
|
||||
return true;
|
||||
}
|
||||
|
||||
CV_Set(v, COM_Argv(1));
|
||||
v->changed = 1; // now it's been changed by (presumably) the user
|
||||
if (!(v->flags & CV_SAVE) || CV_FilterVarByVersion(v, COM_Argv(1)))
|
||||
{
|
||||
CV_Set(v, COM_Argv(1));
|
||||
v->changed = 1; // now it's been changed by (presumably) the user
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -37,6 +37,7 @@
|
||||
#include "d_main.h"
|
||||
#include "m_argv.h"
|
||||
#include "i_system.h"
|
||||
#include "command.h" // cv_execversion
|
||||
|
||||
#include "m_anigif.h"
|
||||
|
||||
|
||||
Reference in new issue
Block a user