From: meepingsnesroms <guicrith@gmail.com>
Date: Fri, 1 Sep 2017 18:21:48 +0000 (-0700)
Subject: Merge pull request #2 from libretro/master
X-Git-Tag: r24l~785^2~1
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c5b8733e0b286d5a4b4d9b7899e4c17a92cd04a;p=pcsx_rearmed.git

Merge pull request #2 from libretro/master

Update from master
---

6c5b8733e0b286d5a4b4d9b7899e4c17a92cd04a