From: Twinaphex <libretro@gmail.com>
Date: Fri, 22 Apr 2016 15:06:53 +0000 (+0200)
Subject: Merge pull request #33 from dankcushions/master
X-Git-Tag: r24l~857
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18ef7635b0b265350eb8304a26edeb8d4b0b2e19;p=pcsx_rearmed.git

Merge pull request #33 from dankcushions/master

Merging in latest upstream changes
---

18ef7635b0b265350eb8304a26edeb8d4b0b2e19