diff options
| author | Loki Rautio <lokirautio@gmail.com> | 2026-03-04 03:56:03 -0600 |
|---|---|---|
| committer | Loki Rautio <lokirautio@gmail.com> | 2026-03-04 03:56:03 -0600 |
| commit | 42aec6dac53dffa6afe072560a7e1d4986112538 (patch) | |
| tree | 0836426857391df1b6a83f6368a183f83ec9b104 /Minecraft.Client/stdafx.h | |
| parent | c9d58eeac7c72f0b3038e084667b4d89a6249fce (diff) | |
| parent | ef9b6fd500dfabd9463267b0dd9e29577eea8a2b (diff) | |
Merge branch 'main' into pr/win64-world-saves
# Conflicts:
# Minecraft.Client/MinecraftServer.cpp
# README.md
Diffstat (limited to 'Minecraft.Client/stdafx.h')
| -rw-r--r-- | Minecraft.Client/stdafx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Minecraft.Client/stdafx.h b/Minecraft.Client/stdafx.h index 05b17e81..25d93572 100644 --- a/Minecraft.Client/stdafx.h +++ b/Minecraft.Client/stdafx.h @@ -211,10 +211,10 @@ typedef XUID GameSessionUID; #include "Common\XUI\XUI_Scene_Base.h" #endif +#include "Common\App_defines.h" #include "Common\UI\UIEnums.h" #include "Common\UI\UIStructs.h" // #ifdef _XBOX -#include "Common\App_defines.h" #include "Common\App_enums.h" #include "Common\Tutorial\TutorialEnum.h" #include "Common\App_structs.h" |