Merge branch 'libretro'
authornotaz <notasas@gmail.com>
Mon, 10 Dec 2012 21:41:06 +0000 (23:41 +0200)
committernotaz <notasas@gmail.com>
Mon, 10 Dec 2012 21:41:06 +0000 (23:41 +0200)
commit3601e36bd526c63c842f68b2ff6cac82954e5e7e
treecc959168ba476f626440b60c4b93e1a5c83f3c4b
parentf29fbd5358e28135d389e2218da7c90f8b94b983
parentcc4f9b703ba166301a31ef6c695e1d02572e6bc4
Merge branch 'libretro'

Conflicts:
frontend/libretro.c
frontend/libretro.c