notaz.gp2x.de
/
pcsx_rearmed.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
10ed51a
829ebbc
)
Merge pull request #49 from meepingsnesroms/master
author
Twinaphex
<libretro@gmail.com>
Tue, 5 Jul 2016 11:14:06 +0000
(13:14 +0200)
committer
GitHub
<noreply@github.com>
Tue, 5 Jul 2016 11:14:06 +0000
(13:14 +0200)
Fix compiling with ndk r11 >
Trivial merge