summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon
diff options
context:
space:
mode:
authorskidau <skidau@gmail.com>2012-05-01 22:22:39 +1000
committerskidau <skidau@gmail.com>2012-05-01 22:22:39 +1000
commitf28e0cff15276ef44fdfcfaf0f425e5e427921d7 (patch)
treeb95cf4f765b70e796b35d5bac7cc670f264590ec /Source/Core/InputCommon
parent1b15cd0b60a3a6341d12dd407737ff49af9960f8 (diff)
parentcce63e7bdb30f15aaf01f2043a8d6ab085a219ae (diff)
Merge branch 'ARAM' of https://code.google.com/p/dolphin-emu into ARAM
* 'ARAM' of https://code.google.com/p/dolphin-emu: Fixed ARAM DMA overflow situations. Fixes issue 4952. Conflicts: Source/Core/Core/Src/HW/DSP.cpp
Diffstat (limited to 'Source/Core/InputCommon')
0 files changed, 0 insertions, 0 deletions