Skip to content

Commit

Permalink
Merge branch 'master' into min-ver-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Fernando-A-Rocha committed Nov 19, 2024
2 parents f7f5e48 + 4fe9084 commit 776b015
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 0 additions & 1 deletion Client/core/CConsole.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ class CConsole : public CConsoleInterface
bool IsInputActive();
void ActivateInput();

void HandleTextAccepted(bool bHandled);
void GetCommandInfo(const std::string& strIn, std::string& strCmdOut, std::string& strCmdLineOut);

void ResetHistoryChanges();
Expand Down
2 changes: 2 additions & 0 deletions Server/mods/deathmatch/logic/CResource.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
#include <net/SimHeaders.h>
#include <zip.h>
#include <glob/glob.h>
#include "version.h"
#include "CStaticFunctionDefinitions.h"

#ifdef WIN32
#include <zip/iowin32.h>
Expand Down

0 comments on commit 776b015

Please sign in to comment.