Merge branch 'enhancement'
authornotaz <notasas@gmail.com>
Fri, 2 Nov 2012 01:07:05 +0000 (03:07 +0200)
committernotaz <notasas@gmail.com>
Fri, 2 Nov 2012 01:07:05 +0000 (03:07 +0200)
commit2857d72e4ca743bba3cf55e298949e24d97dff02
tree3742f3cd7cb1c10fc42fc4b581fff9c4ead3d9ce
parent0e53ec55691229fee1cbb7c23b305be6a59431c4
parentbcb62992749a7f66e9a16a8022e090ff334c4424
Merge branch 'enhancement'

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