diff options
| author | Johannes Schickel | 2012-02-24 22:32:49 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2012-02-24 22:32:49 +0100 |
| commit | 7fe3bdebc05252c02efdf5ba2680b54e2eca4263 (patch) | |
| tree | 543532c9c3f129818912135b2e0256008ca62173 /icons/scummvm.svg | |
| parent | 6b17507b76e3ac1efd8aa5dc12684a233d52046b (diff) | |
| parent | a71a91db17969cc4149905697dd84e72b1baf330 (diff) | |
| download | scummvm-rg350-7fe3bdebc05252c02efdf5ba2680b54e2eca4263.tar.gz scummvm-rg350-7fe3bdebc05252c02efdf5ba2680b54e2eca4263.tar.bz2 scummvm-rg350-7fe3bdebc05252c02efdf5ba2680b54e2eca4263.zip | |
Merge pull request #197 from phoenixtail26/cleanedARCorrection.
This is a manual merge with some conflict fixups.
Conflicts:
backends/platform/iphone/iphone_video.mm
Diffstat (limited to 'icons/scummvm.svg')
0 files changed, 0 insertions, 0 deletions