diff options
| author |  David | 2019-09-05 09:50:17 +1000 |
|---|---|---|
| committer |  GitHub | 2019-09-05 09:50:17 +1000 |
| commit | 0a4f0b6a5d28c75753f0f07bd73e71788bae314f (patch) | |
| tree | 8a9e3cc2fc86ec0d467b631673394a4b38d40422 /src | |
| parent | Merge pull request #2801 from ReinUsesLisp/typed-decompiler (diff) | |
| parent | Fix clang-format (diff) | |
| download | yuzu-0a4f0b6a5d28c75753f0f07bd73e71788bae314f.tar.gz yuzu-0a4f0b6a5d28c75753f0f07bd73e71788bae314f.tar.xz yuzu-0a4f0b6a5d28c75753f0f07bd73e71788bae314f.zip | |
Merge pull request #2818 from MysticExile/fmt
externals: update fmt to 6.0.0
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/fatal/fatal.cpp | 2 | ||||
| -rw-r--r-- | src/core/reporter.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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" |