aboutsummaryrefslogtreecommitdiff
path: root/backends/plugins/sdl
diff options
context:
space:
mode:
authorJohannes Schickel2011-02-15 23:40:06 +0100
committerJohannes Schickel2011-02-15 23:42:50 +0100
commita02454644af514c4f50b861cc718e2951d4c46dd (patch)
treee6385482a68f330f412e87aa33b049b4f5912911 /backends/plugins/sdl
parent01d511bf1b6df74254a2f6bd3007e884cd0c0dde (diff)
parent369db4fdfd5dac16858505f91cb37f4ae386fe80 (diff)
downloadscummvm-rg350-a02454644af514c4f50b861cc718e2951d4c46dd.tar.gz
scummvm-rg350-a02454644af514c4f50b861cc718e2951d4c46dd.tar.bz2
scummvm-rg350-a02454644af514c4f50b861cc718e2951d4c46dd.zip
Merge branch 'master' into osystem-palette
Conflicts: backends/platform/wii/osystem_gfx.cpp
Diffstat (limited to 'backends/plugins/sdl')
0 files changed, 0 insertions, 0 deletions