-
Committer:
Stefanos Kornilios Mitsis Poiitidis
-
Date:
2013-12-28 21:28:50 UTC
-
mfrom:
(8.1.19)
-
Revision ID:
git-v1:f5d29677b32441c3f7870a198a1d5a8b0bdb8b9c
Merge branch 'androidui'
Conflicts:
        core/hw/pvr/spg.cpp
        core/hw/sh4/interpr/sh4_interpreter.cpp
        reicast/android/src/com/reicast/emulator/MainActivity.java