Merge branch 'pandora' of https://github.com/reicast/emulator into pandora

This commit is contained in:
ptitSeb 2014-08-18 23:03:05 +02:00
commit 763e0948c0
2 changed files with 2 additions and 2 deletions