aboutsummaryrefslogtreecommitdiff
path: root/libpcsxcore/cdriso.c
diff options
context:
space:
mode:
authornotaz2012-11-02 03:07:05 +0200
committernotaz2012-11-02 03:07:05 +0200
commit2857d72e4ca743bba3cf55e298949e24d97dff02 (patch)
tree3742f3cd7cb1c10fc42fc4b581fff9c4ead3d9ce /libpcsxcore/cdriso.c
parent0e53ec55691229fee1cbb7c23b305be6a59431c4 (diff)
parentbcb62992749a7f66e9a16a8022e090ff334c4424 (diff)
downloadpcsx_rearmed-2857d72e4ca743bba3cf55e298949e24d97dff02.tar.gz
pcsx_rearmed-2857d72e4ca743bba3cf55e298949e24d97dff02.tar.bz2
pcsx_rearmed-2857d72e4ca743bba3cf55e298949e24d97dff02.zip
Merge branch 'enhancement'
Conflicts: frontend/libretro.c
Diffstat (limited to 'libpcsxcore/cdriso.c')
0 files changed, 0 insertions, 0 deletions