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/sci | |
| 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/sci')
| -rw-r--r-- | devtools/sci/musicplayer.cpp | 2 | ||||
| -rw-r--r-- | devtools/sci/scitrace.asm | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/devtools/sci/musicplayer.cpp b/devtools/sci/musicplayer.cpp index e4d0779848..d225195f71 100644 --- a/devtools/sci/musicplayer.cpp +++ b/devtools/sci/musicplayer.cpp @@ -96,5 +96,3 @@ int main(int argc, char** argv) { scir_free_resource_manager(resmgr); return 0; } - - diff --git a/devtools/sci/scitrace.asm b/devtools/sci/scitrace.asm index 2e541326f2..2c5d2cc4cc 100644 --- a/devtools/sci/scitrace.asm +++ b/devtools/sci/scitrace.asm @@ -130,4 +130,3 @@ NowInstallTSR: code_seg ends end scitrace - |