From: Twinaphex <libretro@gmail.com>
Date: Mon, 24 Feb 2020 18:39:44 +0000 (+0100)
Subject: Merge pull request #389 from notaz/master
X-Git-Tag: r24l~660
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28d1bea2e828cd079593abc8c97ea6ff4fd7d4f4;p=pcsx_rearmed.git

Merge pull request #389 from notaz/master

Merge upstream changes
---

28d1bea2e828cd079593abc8c97ea6ff4fd7d4f4