notaz.gp2x.de / pcsx_rearmed.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: af3eda9 6e1725a)
Merge pull request #96 from orbea/zlib
authorTwinaphex <libretro@gmail.com>
Tue, 24 Jan 2017 23:20:37 +0000 (00:20 +0100)
committerGitHub <noreply@github.com>
Tue, 24 Jan 2017 23:20:37 +0000 (00:20 +0100)
Rename uncompress2 to avoid conflicts with zlib.h on some systems


Trivial merge
ARM optimized PCSX fork