From: meepingsnesroms <guicrith@gmail.com>
Date: Fri, 7 Apr 2017 16:12:17 +0000 (-0700)
Subject: Merge pull request #1 from libretro/master
X-Git-Tag: r24l~795^2~2
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f69f94c063891f2bfc95f35f524037f30b5bcc64;p=pcsx_rearmed.git

Merge pull request #1 from libretro/master

update from master
---

f69f94c063891f2bfc95f35f524037f30b5bcc64