diff options
| author | Alyssa Milburn | 2011-08-22 20:03:05 +0200 |
|---|---|---|
| committer | Alyssa Milburn | 2011-08-22 20:03:05 +0200 |
| commit | 84063dc9727a9f55e09d39574027beab695680e6 (patch) | |
| tree | d71a9599cb550d9f7949a2d3209574064e054d85 /devtools/sci | |
| parent | c6e89df3d940747a85d447f172e2323c800f5eaf (diff) | |
| parent | a39a3eda46aea108a51556f001617ad28d29e520 (diff) | |
| download | scummvm-rg350-84063dc9727a9f55e09d39574027beab695680e6.tar.gz scummvm-rg350-84063dc9727a9f55e09d39574027beab695680e6.tar.bz2 scummvm-rg350-84063dc9727a9f55e09d39574027beab695680e6.zip | |
Merge remote-tracking branch 'origin/master' into soltys_wip2
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 - |