diff options
| author | Matthew Hoops | 2012-09-12 20:18:13 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-09-12 20:18:13 -0400 |
| commit | d5ed8b1901b88e361a2a420a9daf586f6089a36b (patch) | |
| tree | d19e4dd7baf33b7447d69d8ad8d3c25732a69698 /engines/wintermute/base/scriptables/script_engine.cpp | |
| parent | ff51a7661d7a2cb296b987edfc3d81727160e627 (diff) | |
| parent | 8808393b3a3428df2946d7967e52aba084c8ffe5 (diff) | |
| download | scummvm-rg350-d5ed8b1901b88e361a2a420a9daf586f6089a36b.tar.gz scummvm-rg350-d5ed8b1901b88e361a2a420a9daf586f6089a36b.tar.bz2 scummvm-rg350-d5ed8b1901b88e361a2a420a9daf586f6089a36b.zip | |
Merge remote branch 'upstream/master' into pegasus
Conflicts:
AUTHORS
Diffstat (limited to 'engines/wintermute/base/scriptables/script_engine.cpp')
| -rw-r--r-- | engines/wintermute/base/scriptables/script_engine.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/engines/wintermute/base/scriptables/script_engine.cpp b/engines/wintermute/base/scriptables/script_engine.cpp index 20e2ccadd1..3d1863946e 100644 --- a/engines/wintermute/base/scriptables/script_engine.cpp +++ b/engines/wintermute/base/scriptables/script_engine.cpp @@ -33,7 +33,6 @@ #include "engines/wintermute/base/scriptables/script_ext_math.h" #include "engines/wintermute/base/base_engine.h" #include "engines/wintermute/base/base_game.h" -#include "engines/wintermute/base/sound/base_sound.h" #include "engines/wintermute/base/base_file_manager.h" #include "engines/wintermute/utils/utils.h" |