Merge branch 'libretro' into upstream
authornotaz <notasas@gmail.com>
Sat, 20 Dec 2014 19:29:36 +0000 (21:29 +0200)
committernotaz <notasas@gmail.com>
Sat, 20 Dec 2014 19:29:36 +0000 (21:29 +0200)
commit7931825ed8ef51dab3e37475d8126103ebc9fb6f
treed38e169e68e48a3ccbf8a3805f9cb87197ed894a
parentfb01e82a3453b4b068fde274a42df336e778d8d3
parent3e5b01fcef8ef20dacca45ea7a7b0c461e6bd666
Merge branch 'libretro' into upstream

Syncs upstream and libretro trees, leaving out NEON_PC change.