aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2011-06-21 10:35:34 +0200
committerWillem Jan Palenstijn2011-06-21 10:35:34 +0200
commit8534f984c97a0d82f2b14051c28595d91a368ebb (patch)
tree00d02c497e1b9a1f228b60ffa020b57a24507cf1
parent53dfd3a3f5687ba0b8b16522d9c9df915f7ef63c (diff)
parent575fbcb1c1ea904da17fe04580e589514275347a (diff)
downloadscummvm-rg350-8534f984c97a0d82f2b14051c28595d91a368ebb.tar.gz
scummvm-rg350-8534f984c97a0d82f2b14051c28595d91a368ebb.tar.bz2
scummvm-rg350-8534f984c97a0d82f2b14051c28595d91a368ebb.zip
Merge branch 'dreamsrc'
-rw-r--r--devtools/tasmrecover/dreamweb/backdrop.asm1
-rw-r--r--devtools/tasmrecover/dreamweb/debug.asm1
-rw-r--r--devtools/tasmrecover/dreamweb/dreamweb.asm1
-rw-r--r--devtools/tasmrecover/dreamweb/keypad.asm1
-rw-r--r--devtools/tasmrecover/dreamweb/look.asm1
-rw-r--r--devtools/tasmrecover/dreamweb/monitor.asm1
-rw-r--r--devtools/tasmrecover/dreamweb/newplace.asm1
-rw-r--r--devtools/tasmrecover/dreamweb/object.asm1
-rw-r--r--devtools/tasmrecover/dreamweb/print.asm1
-rw-r--r--devtools/tasmrecover/dreamweb/saveload.asm1
-rw-r--r--devtools/tasmrecover/dreamweb/sblaster.asm1
-rw-r--r--devtools/tasmrecover/dreamweb/sprite.asm1
-rw-r--r--devtools/tasmrecover/dreamweb/talk.asm1
-rw-r--r--devtools/tasmrecover/dreamweb/titles.asm1
-rw-r--r--devtools/tasmrecover/dreamweb/use.asm1
-rw-r--r--devtools/tasmrecover/dreamweb/vars.asm1
-rw-r--r--devtools/tasmrecover/dreamweb/vgafades.asm1
-rw-r--r--devtools/tasmrecover/dreamweb/vgagrafx.asm1
18 files changed, 0 insertions, 18 deletions
diff --git a/devtools/tasmrecover/dreamweb/backdrop.asm b/devtools/tasmrecover/dreamweb/backdrop.asm
index c02d95bbe9..5dfe20bf5d 100644
--- a/devtools/tasmrecover/dreamweb/backdrop.asm
+++ b/devtools/tasmrecover/dreamweb/backdrop.asm
@@ -874,4 +874,3 @@ over147: mov ch,0
- \ No newline at end of file
diff --git a/devtools/tasmrecover/dreamweb/debug.asm b/devtools/tasmrecover/dreamweb/debug.asm
index 991e240fd1..951da4fa3f 100644
--- a/devtools/tasmrecover/dreamweb/debug.asm
+++ b/devtools/tasmrecover/dreamweb/debug.asm
@@ -379,4 +379,3 @@ debugtextr: db "00000",0
endif
- \ No newline at end of file
diff --git a/devtools/tasmrecover/dreamweb/dreamweb.asm b/devtools/tasmrecover/dreamweb/dreamweb.asm
index a3c165aaf9..fd9bfb715c 100644
--- a/devtools/tasmrecover/dreamweb/dreamweb.asm
+++ b/devtools/tasmrecover/dreamweb/dreamweb.asm
@@ -6278,4 +6278,3 @@ STACKSPACE ends

- \ No newline at end of file
diff --git a/devtools/tasmrecover/dreamweb/keypad.asm b/devtools/tasmrecover/dreamweb/keypad.asm
index d75a4fde82..8ac38524aa 100644
--- a/devtools/tasmrecover/dreamweb/keypad.asm
+++ b/devtools/tasmrecover/dreamweb/keypad.asm
@@ -1755,4 +1755,3 @@ Findtext1 proc near
endp
- \ No newline at end of file
diff --git a/devtools/tasmrecover/dreamweb/look.asm b/devtools/tasmrecover/dreamweb/look.asm
index b5bc913a73..399e1f16fd 100644
--- a/devtools/tasmrecover/dreamweb/look.asm
+++ b/devtools/tasmrecover/dreamweb/look.asm
@@ -164,4 +164,3 @@ dogetback: mov getback,1
- \ No newline at end of file
diff --git a/devtools/tasmrecover/dreamweb/monitor.asm b/devtools/tasmrecover/dreamweb/monitor.asm
index 7cc1a5a4dd..247ba10f2b 100644
--- a/devtools/tasmrecover/dreamweb/monitor.asm
+++ b/devtools/tasmrecover/dreamweb/monitor.asm
@@ -1493,4 +1493,3 @@ finishcurdel:
- \ No newline at end of file
diff --git a/devtools/tasmrecover/dreamweb/newplace.asm b/devtools/tasmrecover/dreamweb/newplace.asm
index 10a587f25b..ac703f6b11 100644
--- a/devtools/tasmrecover/dreamweb/newplace.asm
+++ b/devtools/tasmrecover/dreamweb/newplace.asm
@@ -581,4 +581,3 @@ Readcitypic proc near
- \ No newline at end of file
diff --git a/devtools/tasmrecover/dreamweb/object.asm b/devtools/tasmrecover/dreamweb/object.asm
index d0465e09bc..bdd043d588 100644
--- a/devtools/tasmrecover/dreamweb/object.asm
+++ b/devtools/tasmrecover/dreamweb/object.asm
@@ -2607,4 +2607,3 @@ beforethistext: mov [es:di],ax
- \ No newline at end of file
diff --git a/devtools/tasmrecover/dreamweb/print.asm b/devtools/tasmrecover/dreamweb/print.asm
index e1c2d451c9..a2052285f0 100644
--- a/devtools/tasmrecover/dreamweb/print.asm
+++ b/devtools/tasmrecover/dreamweb/print.asm
@@ -588,4 +588,3 @@ nomod: ret
endp
endif
- \ No newline at end of file
diff --git a/devtools/tasmrecover/dreamweb/saveload.asm b/devtools/tasmrecover/dreamweb/saveload.asm
index 9a34a763f2..369e799d53 100644
--- a/devtools/tasmrecover/dreamweb/saveload.asm
+++ b/devtools/tasmrecover/dreamweb/saveload.asm
@@ -1517,4 +1517,3 @@ noloadold: ret
- \ No newline at end of file
diff --git a/devtools/tasmrecover/dreamweb/sblaster.asm b/devtools/tasmrecover/dreamweb/sblaster.asm
index 9eb9afc08f..46eb8e2366 100644
--- a/devtools/tasmrecover/dreamweb/sblaster.asm
+++ b/devtools/tasmrecover/dreamweb/sblaster.asm
@@ -1290,4 +1290,3 @@ nopitflip: cli
- \ No newline at end of file
diff --git a/devtools/tasmrecover/dreamweb/sprite.asm b/devtools/tasmrecover/dreamweb/sprite.asm
index f6e883abeb..fadea3b790 100644
--- a/devtools/tasmrecover/dreamweb/sprite.asm
+++ b/devtools/tasmrecover/dreamweb/sprite.asm
@@ -5031,4 +5031,3 @@ finishevery2: ret
- \ No newline at end of file
diff --git a/devtools/tasmrecover/dreamweb/talk.asm b/devtools/tasmrecover/dreamweb/talk.asm
index d2c27f059b..6bee4409b7 100644
--- a/devtools/tasmrecover/dreamweb/talk.asm
+++ b/devtools/tasmrecover/dreamweb/talk.asm
@@ -577,4 +577,3 @@ doredes: call delpointer
- \ No newline at end of file
diff --git a/devtools/tasmrecover/dreamweb/titles.asm b/devtools/tasmrecover/dreamweb/titles.asm
index acaeefa995..8f2b46e3f4 100644
--- a/devtools/tasmrecover/dreamweb/titles.asm
+++ b/devtools/tasmrecover/dreamweb/titles.asm
@@ -583,4 +583,3 @@ realcreditsearly:
- \ No newline at end of file
diff --git a/devtools/tasmrecover/dreamweb/use.asm b/devtools/tasmrecover/dreamweb/use.asm
index 250aa00240..508e8bd4c1 100644
--- a/devtools/tasmrecover/dreamweb/use.asm
+++ b/devtools/tasmrecover/dreamweb/use.asm
@@ -3807,4 +3807,3 @@ nowinch: call showfirstuse
- \ No newline at end of file
diff --git a/devtools/tasmrecover/dreamweb/vars.asm b/devtools/tasmrecover/dreamweb/vars.asm
index e38470a7de..8646697e52 100644
--- a/devtools/tasmrecover/dreamweb/vars.asm
+++ b/devtools/tasmrecover/dreamweb/vars.asm
@@ -561,4 +561,3 @@ gameerror db 0
howmuchalloc dw 0
- \ No newline at end of file
diff --git a/devtools/tasmrecover/dreamweb/vgafades.asm b/devtools/tasmrecover/dreamweb/vgafades.asm
index 26874a428f..06cc9d6a44 100644
--- a/devtools/tasmrecover/dreamweb/vgafades.asm
+++ b/devtools/tasmrecover/dreamweb/vgafades.asm
@@ -864,4 +864,3 @@ Initialmoncols proc near
endp
- \ No newline at end of file
diff --git a/devtools/tasmrecover/dreamweb/vgagrafx.asm b/devtools/tasmrecover/dreamweb/vgagrafx.asm
index 1d8e5f5dc7..110fc95ee0 100644
--- a/devtools/tasmrecover/dreamweb/vgagrafx.asm
+++ b/devtools/tasmrecover/dreamweb/vgagrafx.asm
@@ -1760,4 +1760,3 @@ Title7graphics db "DREAMWEB.I07",0
Palettescreen db "DREAMWEB.PAL",0
- \ No newline at end of file