diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-04-14 20:43:42 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-04-14 20:43:42 -0500 |
| commit | 37b67971e7def8dcd0dae3209afc6c69b52d0609 (patch) | |
| tree | 510eccb41b0653225ec3af6bf02b425c72a195e1 /Source/Core | |
| parent | bde7ea00ef9fd625a4e453ee9598fc20382a35a5 (diff) | |
| parent | b91930a2d4742ec001d0b1df1abe938da7527d03 (diff) | |
Merge remote-tracking branch 'origin/master' into Android-trash
Conflicts:
Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Src/ActionReplay.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/Core/Src/ActionReplay.cpp b/Source/Core/Core/Src/ActionReplay.cpp index 98857fae97..d14414c5ef 100644 --- a/Source/Core/Core/Src/ActionReplay.cpp +++ b/Source/Core/Core/Src/ActionReplay.cpp @@ -535,7 +535,7 @@ bool Subtype_RamWriteAndFill(const ARAddr addr, const u32 data) case DATATYPE_32BIT_FLOAT: case DATATYPE_32BIT: // Dword write - LogInfo("32bit Write"); + LogInfo("32-bit Write"); LogInfo("--------"); Memory::Write_U32(data, new_addr); LogInfo("Wrote %08x to address %08x", data, new_addr); |