notaz.gp2x.de
/
pcsx_rearmed.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4ed8f00
1632490
)
Merge pull request #33 from dankcushions/master
author
Twinaphex
<libretro@gmail.com>
Fri, 22 Apr 2016 15:06:53 +0000
(17:06 +0200)
committer
Twinaphex
<libretro@gmail.com>
Fri, 22 Apr 2016 15:06:53 +0000
(17:06 +0200)
Merging in latest upstream changes
Trivial merge