From: Twinaphex <libretro@gmail.com>
Date: Mon, 19 Dec 2016 21:47:05 +0000 (+0100)
Subject: Merge pull request #85 from alexis-puska/master_merged
X-Git-Tag: r24l~813
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17b93a2844f026f8f0d779e9bae698631c746f8a;p=pcsx_rearmed.git

Merge pull request #85 from alexis-puska/master_merged

Master merged
---

17b93a2844f026f8f0d779e9bae698631c746f8a