Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
chrxh committed Sep 7, 2023
2 parents 15cfcd8 + ed29a2f commit d0659c8
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions source/Base/GlobalSettings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
#include "Base/LoggingService.h"
#include "Base/Resources.h"

#include "JsonParser.h"

#ifdef _WIN32
namespace
{
Expand Down

0 comments on commit d0659c8

Please sign in to comment.