piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 09:09:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into Android-trash

Browse Source 
Conflicts:
	Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp
This commit is contained in:
Ryan Houdek
2013-04-14 20:43:42 -05:00
parent bde7ea00ef b91930a2d4
commit 37b67971e7
52 changed files with 4634 additions and 4568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/Src/ActionReplay.cpp
View File

@ -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);