notaz.gp2x.de
/
pcsx_rearmed.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fb01e82
3e5b01f
)
Merge branch 'libretro' into upstream
author
notaz
<notasas@gmail.com>
Sat, 20 Dec 2014 19:29:36 +0000
(21:29 +0200)
committer
notaz
<notasas@gmail.com>
Sat, 20 Dec 2014 19:29:36 +0000
(21:29 +0200)
Syncs upstream and libretro trees, leaving out NEON_PC change.
Trivial merge