From: notaz <notasas@gmail.com>
Date: Sat, 20 Dec 2014 19:29:36 +0000 (+0200)
Subject: Merge branch 'libretro' into upstream
X-Git-Tag: r24l~893^2
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7931825ed8ef51dab3e37475d8126103ebc9fb6f;p=pcsx_rearmed.git

Merge branch 'libretro' into upstream

Syncs upstream and libretro trees, leaving out NEON_PC change.
---

7931825ed8ef51dab3e37475d8126103ebc9fb6f