summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar David2019-09-05 09:50:17 +1000
committerGravatar GitHub2019-09-05 09:50:17 +1000
commit0a4f0b6a5d28c75753f0f07bd73e71788bae314f (patch)
tree8a9e3cc2fc86ec0d467b631673394a4b38d40422
parentMerge pull request #2801 from ReinUsesLisp/typed-decompiler (diff)
parentFix clang-format (diff)
downloadyuzu-0a4f0b6a5d28c75753f0f07bd73e71788bae314f.tar.gz
yuzu-0a4f0b6a5d28c75753f0f07bd73e71788bae314f.tar.xz
yuzu-0a4f0b6a5d28c75753f0f07bd73e71788bae314f.zip
Merge pull request #2818 from MysticExile/fmt
externals: update fmt to 6.0.0
m---------externals/fmt0
-rw-r--r--src/core/hle/service/fatal/fatal.cpp2
-rw-r--r--src/core/reporter.cpp2
3 files changed, 2 insertions, 2 deletions
diff --git a/externals/fmt b/externals/fmt
Subproject 9e554999ce02cf86fcdfe74fe740c4fe3f5a56d Subproject 7512a55aa3ae309587ca89668ef9ec4074a51a1
diff --git a/src/core/hle/service/fatal/fatal.cpp b/src/core/hle/service/fatal/fatal.cpp
index fe49c2161..01fa06ad3 100644
--- a/src/core/hle/service/fatal/fatal.cpp
+++ b/src/core/hle/service/fatal/fatal.cpp
@@ -5,7 +5,7 @@
5#include <array> 5#include <array>
6#include <cstring> 6#include <cstring>
7#include <ctime> 7#include <ctime>
8#include <fmt/time.h> 8#include <fmt/chrono.h>
9#include "common/file_util.h" 9#include "common/file_util.h"
10#include "common/logging/log.h" 10#include "common/logging/log.h"
11#include "common/scm_rev.h" 11#include "common/scm_rev.h"
diff --git a/src/core/reporter.cpp b/src/core/reporter.cpp
index 5d4c3e6ea..cfe0771e2 100644
--- a/src/core/reporter.cpp
+++ b/src/core/reporter.cpp
@@ -5,8 +5,8 @@
5#include <ctime> 5#include <ctime>
6#include <fstream> 6#include <fstream>
7 7
8#include <fmt/chrono.h>
8#include <fmt/format.h> 9#include <fmt/format.h>
9#include <fmt/time.h>
10#include <json.hpp> 10#include <json.hpp>
11 11
12#include "common/file_util.h" 12#include "common/file_util.h"