From: Sakitoshi <39132563+Sakitoshi@users.noreply.github.com>
Date: Thu, 24 Jan 2019 00:51:34 +0000 (-0300)
Subject: Merge pull request #1 from libretro/master
X-Git-Tag: r24l~758^2~1
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e424c297b7b714cf2f25582cf9b4fc30cba5599f;p=pcsx_rearmed.git

Merge pull request #1 from libretro/master

catch up to libretro repo
---

e424c297b7b714cf2f25582cf9b4fc30cba5599f