diff options
| author | Matthew Hoops | 2011-08-26 22:44:17 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-08-26 22:44:17 -0400 |
| commit | 4a69dc13d92e82fff85dc5a3a923b74ced259ffa (patch) | |
| tree | 8945cd3745fd65f28b043caf7b1beddbbce2b2a1 /devtools/create_mads | |
| parent | ad293b249e74dd1cfbdbd721d02145efbdaf9eca (diff) | |
| parent | 5e174cbfe466dbbe8e5470b0a00de1481b986181 (diff) | |
| download | scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.tar.gz scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.tar.bz2 scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'devtools/create_mads')
| -rw-r--r-- | devtools/create_mads/main.cpp | 2 | ||||
| -rw-r--r-- | devtools/create_mads/scripts/rex_nebular.txt | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/devtools/create_mads/main.cpp b/devtools/create_mads/main.cpp index aec9e45b8b..b4de34d832 100644 --- a/devtools/create_mads/main.cpp +++ b/devtools/create_mads/main.cpp @@ -124,4 +124,4 @@ int main(int argc, char *argv[]) { } return 0; -}
\ No newline at end of file +} diff --git a/devtools/create_mads/scripts/rex_nebular.txt b/devtools/create_mads/scripts/rex_nebular.txt index f177720398..f33a574813 100644 --- a/devtools/create_mads/scripts/rex_nebular.txt +++ b/devtools/create_mads/scripts/rex_nebular.txt @@ -2239,5 +2239,3 @@ sub scene101_actions @2f6ba: RET end - - |