From: twinaphex <libretro@gmail.com>
Date: Wed, 31 Dec 2014 10:43:39 +0000 (+0100)
Subject: Merge https://github.com/notaz/pcsx_rearmed
X-Git-Tag: r24l~891
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be1294d017cba3f18cf66597f0cbed207fed26bf;p=pcsx_rearmed.git

Merge https://github.com/notaz/pcsx_rearmed
---

be1294d017cba3f18cf66597f0cbed207fed26bf