From: notaz <notasas@gmail.com>
Date: Wed, 12 Sep 2012 23:17:48 +0000 (+0300)
Subject: Merge branch 'libretro'
X-Git-Tag: r16~21
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84365ca2e1751440f0af970abd3b8517ae97a055;p=pcsx_rearmed.git

Merge branch 'libretro'
---

84365ca2e1751440f0af970abd3b8517ae97a055