From: hizzlekizzle <hizzlekizzle@users.noreply.github.com>
Date: Wed, 13 Mar 2019 02:49:57 +0000 (-0500)
Subject: Merge pull request #244 from retro-wertz/sync_to_upstream
X-Git-Tag: r24l~747
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=949ed5baf43dbb3ef3b51f43498f050e2d1e4c40;p=pcsx_rearmed.git

Merge pull request #244 from retro-wertz/sync_to_upstream

fetch new updates from upstream
---

949ed5baf43dbb3ef3b51f43498f050e2d1e4c40