From: alexis-puska <a.puska@ile-noire.com>
Date: Sun, 31 Jul 2016 13:05:09 +0000 (+0200)
Subject: Merge remote-tracking branch 'libretro/master'
X-Git-Tag: r24l~813^2~2
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=127622a0091a7a54c8c32069bdd262ad6d402b16;p=pcsx_rearmed.git

Merge remote-tracking branch 'libretro/master'
---

127622a0091a7a54c8c32069bdd262ad6d402b16