merge attempt

This commit is contained in:
Nikolay Korolev committed 2020-12-19 03:21:04 +03:00
commit 8d1996833b
68 files changed
+2149 -316

No files matched your search

+2 -2
View File
@@ -22,7 +22,7 @@
#include "Game.h"
#include "World.h"
#include "PlayerInfo.h"
#include "FrontendControls.h"
#include "FrontEndControls.h"
#include "MemoryCard.h"
#define CRect_SZ(x, y, w, h) CRect(x, y, x+w, y+h)
@@ -3017,4 +3017,4 @@ CMenuManager::FilterOutColorMarkersFromString(wchar *string, CRGBA &color)
*dst = '\0';
}
#endif
#endif