citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Merge pull request #4915 from FearlessTobi/port-2818 

Port citra-emu/citra#2818: "externals: update fmt to 6.0.0"
This commit is contained in:
Weiyi Wang 2019-09-08 08:42:02 -04:00 committed by GitHub
parent 4bc22aa350 56091241ff
commit 24ec11f928
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
externals/fmt vendored

@ -1 +1 @@
Subproject commit 9e554999ce02cf86fcdfe74fe740c4fe3f5a56d5 Subproject commit 7512a55aa3ae309587ca89668ef9ec4074a51a1f

2
src/core/perf_stats.cpp
View File

@ -8,8 +8,8 @@
#include <mutex> #include <mutex>
#include <numeric> #include <numeric>
#include <thread> #include <thread>
#include <fmt/chrono.h>
#include <fmt/format.h> #include <fmt/format.h>
#include <fmt/time.h>
#include "common/file_util.h" #include "common/file_util.h"
#include "core/hw/gpu.h" #include "core/hw/gpu.h"
#include "core/perf_stats.h" #include "core/perf_stats.h"