diff options
| author | Paul Gilbert | 2015-08-30 19:36:40 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-08-30 19:36:40 -0400 |
| commit | 2356501d349098b9e408662155da490b176764d6 (patch) | |
| tree | a53a4e316cb17a64b6e815ddbab306044738ed00 /po/remove-potcdate.sed | |
| parent | e5296ebf8dd09f603499b1894a33865ec71bb28f (diff) | |
| parent | 62973836e1ec7b32a9425fd65e976416d6b5e320 (diff) | |
| download | scummvm-rg350-2356501d349098b9e408662155da490b176764d6.tar.gz scummvm-rg350-2356501d349098b9e408662155da490b176764d6.tar.bz2 scummvm-rg350-2356501d349098b9e408662155da490b176764d6.zip | |
Merge branch 'master' into phantom
Conflicts:
engines/mads/phantom/game_phantom.cpp
engines/mads/phantom/globals_phantom.h
engines/mads/phantom/phantom_scenes.h
engines/mads/phantom/phantom_scenes1.cpp
engines/mads/phantom/phantom_scenes1.h
engines/sherlock/events.cpp
engines/sherlock/inventory.cpp
engines/sherlock/journal.cpp
engines/sherlock/map.cpp
engines/sherlock/map.h
engines/sherlock/module.mk
engines/sherlock/music.cpp
engines/sherlock/music.h
engines/sherlock/objects.cpp
engines/sherlock/objects.h
engines/sherlock/people.cpp
engines/sherlock/people.h
engines/sherlock/resources.cpp
engines/sherlock/resources.h
engines/sherlock/scalpel/drivers/adlib.cpp
engines/sherlock/scalpel/drivers/mididriver.h
engines/sherlock/scalpel/scalpel.cpp
engines/sherlock/scalpel/scalpel_scene.cpp
engines/sherlock/scalpel/scalpel_scene.h
engines/sherlock/scalpel/scalpel_user_interface.cpp
engines/sherlock/scalpel/scalpel_user_interface.h
engines/sherlock/scalpel/settings.cpp
engines/sherlock/scalpel/tsage/logo.cpp
engines/sherlock/scalpel/tsage/logo.h
engines/sherlock/scene.cpp
engines/sherlock/scene.h
engines/sherlock/screen.cpp
engines/sherlock/screen.h
engines/sherlock/sherlock.cpp
engines/sherlock/sherlock.h
engines/sherlock/sound.cpp
engines/sherlock/sound.h
engines/sherlock/surface.cpp
engines/sherlock/surface.h
engines/sherlock/talk.cpp
engines/sherlock/talk.h
engines/sherlock/tattoo/tattoo.cpp
engines/sherlock/tattoo/tattoo.h
engines/sherlock/tattoo/tattoo_scene.cpp
engines/sherlock/tattoo/tattoo_scene.h
engines/sherlock/tattoo/tattoo_user_interface.cpp
engines/sherlock/tattoo/tattoo_user_interface.h
engines/sherlock/user_interface.cpp
engines/sherlock/user_interface.h
Diffstat (limited to 'po/remove-potcdate.sed')
0 files changed, 0 insertions, 0 deletions