notaz.gp2x.de
/
pcsx_rearmed.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3eb0739
aa3b787
)
Merge pull request #389 from notaz/master
author
Twinaphex
<libretro@gmail.com>
Mon, 24 Feb 2020 18:39:44 +0000
(19:39 +0100)
committer
GitHub
<noreply@github.com>
Mon, 24 Feb 2020 18:39:44 +0000
(19:39 +0100)
Merge upstream changes
1
2
frontend/menu.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
frontend/menu.c
Simple merge