diff options
| author | Matthew Hoops | 2011-08-07 20:11:27 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-08-07 20:11:27 -0400 |
| commit | c05c42ecc60c8f928628787272743f169a0d5903 (patch) | |
| tree | f2b06be630676b7302a1fb62940099b2ec71442d /devtools/sci | |
| parent | e43a6671fc04f2c67b8efa2c0fdfdd6ec0ea1023 (diff) | |
| parent | 45dc303159d5bbe77a351df31e6f2d2f97a3412d (diff) | |
| download | scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.tar.gz scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.tar.bz2 scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.zip | |
Merge remote branch 'upstream/master' into soccer
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 - |