diff options
| author | Paul Gilbert | 2015-05-16 09:29:40 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-05-16 09:29:40 -0400 |
| commit | af651e19a421781a1498de0e66909a2e9450611c (patch) | |
| tree | ee5991b696600dd4fe03338b04a684a605215a7c /video | |
| parent | 32d7690e549f5af8fb5f88d9434ae0f54c0e6c69 (diff) | |
| parent | 96e929f5233b23917169c7d0121e9c1e264455c1 (diff) | |
| download | scummvm-rg350-af651e19a421781a1498de0e66909a2e9450611c.tar.gz scummvm-rg350-af651e19a421781a1498de0e66909a2e9450611c.tar.bz2 scummvm-rg350-af651e19a421781a1498de0e66909a2e9450611c.zip | |
Merge branch 'sherlock' into sherlock2
Conflicts:
engines/sherlock/decompress.cpp
engines/sherlock/objects.cpp
engines/sherlock/objects.h
engines/sherlock/scene.cpp
engines/sherlock/scene.h
engines/sherlock/sound.cpp
Diffstat (limited to 'video')
0 files changed, 0 insertions, 0 deletions