diff options
| author | bunnei <ericbunnie@gmail.com> | 2014-06-14 12:13:16 -0400 |
|---|---|---|
| committer | bunnei <ericbunnie@gmail.com> | 2014-06-14 12:13:16 -0400 |
| commit | 004df767953a949817da89bddcd5d1379240f769 (patch) | |
| tree | b2d54928dcbf3cb4dde0cd5d3277afe7999b7bd9 /src/core/hle/config_mem.cpp | |
| parent | c34ba380011921a9d984136381c3a65a1e2389d5 (diff) | |
| parent | b45a38f55794e47b0429a8667441a20433e19e42 (diff) | |
Merge branch 'threading' of https://github.com/bunnei/citra
Conflicts:
src/core/hle/function_wrappers.h
src/core/hle/service/gsp.cpp
Diffstat (limited to 'src/core/hle/config_mem.cpp')
| -rw-r--r-- | src/core/hle/config_mem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/config_mem.cpp b/src/core/hle/config_mem.cpp index 48aa878cc..8c898b265 100644 --- a/src/core/hle/config_mem.cpp +++ b/src/core/hle/config_mem.cpp @@ -55,7 +55,7 @@ inline void Read(T &var, const u32 addr) { break; default: - ERROR_LOG(HLE, "unknown ConfigMem::Read%d @ 0x%08X", sizeof(var) * 8, addr); + ERROR_LOG(HLE, "unknown addr=0x%08X", addr); } } |