aboutsummaryrefslogtreecommitdiff
path: root/icons/scummvm.icns
diff options
context:
space:
mode:
authorangstsmurf2016-10-18 02:58:19 +0200
committerangstsmurf2016-10-18 02:58:19 +0200
commit17f3626214d3244bfe07b4f263c99be2de07a289 (patch)
tree48bca830bc142505dad7f378c7cac7c9531f0cc9 /icons/scummvm.icns
parenta946e9eab95201d4ee3dd0d4eaeb3a088fb819fe (diff)
downloadscummvm-rg350-17f3626214d3244bfe07b4f263c99be2de07a289.tar.gz
scummvm-rg350-17f3626214d3244bfe07b4f263c99be2de07a289.tar.bz2
scummvm-rg350-17f3626214d3244bfe07b4f263c99be2de07a289.zip
COMPOSER: Delete leftover git conflict marker
Diffstat (limited to 'icons/scummvm.icns')
0 files changed, 0 insertions, 0 deletions