From: hizzlekizzle <hizzlekizzle@users.noreply.github.com>
Date: Thu, 28 Mar 2019 15:11:58 +0000 (-0500)
Subject: Merge pull request #265 from hhromic/master
X-Git-Tag: r24l~737
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=588bf7918460109815d5cc505ada4334a4c5a791;p=pcsx_rearmed.git

Merge pull request #265 from hhromic/master

Sync upstream commits lost during recent PR squash
---

588bf7918460109815d5cc505ada4334a4c5a791