sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into test-staging

Browse Source 
# Conflicts:
#	.github/workflows/windows_build.yml
#	src/server/game/Handlers/CharacterHandler.cpp
This commit is contained in:
Keleborn
2026-07-17 15:15:37 -07:00
parent 3010662657 0cb715b766
commit 7f56125ccc
156 changed files with 2834 additions and 948 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deps/g3dlite/include/G3D/platform.h
Vendored
+1 -1
View File
@@ -360,7 +360,7 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw) {\
// Bring in shared_ptr and weak_ptr
#if (defined(__GNUC__) && defined(__APPLE__)) || defined(__linux__)
#include <ciso646> // Defines _LIBCC_VERSION if linking against libc++ or does nothing
#include <version> // Defines _LIBCC_VERSION if linking against libc++ or does nothing
#endif
#if (!defined(_LIBCPP_VERSION) && defined(__APPLE__)) || (!defined(_LIBCPP_VERSION) && defined(__linux__))
# include <tr1/memory>