diff options
| author | Willem Jan Palenstijn | 2015-07-22 22:37:40 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-07-22 22:43:42 +0200 |
| commit | 6ec9c81b575f13b2c4b30aeac592ebf2557b5890 (patch) | |
| tree | 503d50902bad2d800165593039d08d5ccf0c98ab /engines/cine/detection_tables.h | |
| parent | 5ec05f6b647c5ea41418be7ed19ad381f97cabd8 (diff) | |
| parent | 4e5c8d35f7e133e2e72a846fdbd54900c91eeb73 (diff) | |
| download | scummvm-rg350-6ec9c81b575f13b2c4b30aeac592ebf2557b5890.tar.gz scummvm-rg350-6ec9c81b575f13b2c4b30aeac592ebf2557b5890.tar.bz2 scummvm-rg350-6ec9c81b575f13b2c4b30aeac592ebf2557b5890.zip | |
Merge branch 'master' into mm
Conflicts:
engines/access/access.cpp
engines/access/asurface.h
engines/access/bubble_box.cpp
engines/access/bubble_box.h
engines/access/martian/martian_game.cpp
engines/access/player.cpp
engines/access/player.h
engines/access/resources.cpp
engines/access/screen.cpp
engines/access/screen.h
engines/access/sound.cpp
engines/access/sound.h
Diffstat (limited to 'engines/cine/detection_tables.h')
| -rw-r--r-- | engines/cine/detection_tables.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/engines/cine/detection_tables.h b/engines/cine/detection_tables.h index 6069e3a99b..1188deb1a6 100644 --- a/engines/cine/detection_tables.h +++ b/engines/cine/detection_tables.h @@ -379,6 +379,20 @@ static const CINEGameDescription gameDescriptions[] = { { { "os", + "Demo", + AD_ENTRY1("demo_os", "043859e4cfe3977ad95b6efd00b21c62"), + Common::EN_GRB, + Common::kPlatformDOS, + ADGF_DEMO | ADGF_UNSTABLE, + GUIO0() + }, + GType_OS, + GF_DEMO, + }, + + { + { + "os", "", AD_ENTRY1("procs0", "a9da5531ead0ebf9ad387fa588c0cbb0"), Common::EN_GRB, |