projects
/
h316.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed vpunch from build
[h316.git]
/
lib
/
iolib
/
recipe
/
dap-lib.recipe
diff --git
a/lib/iolib/recipe/dap-lib.recipe
b/lib/iolib/recipe/dap-lib.recipe
index 65e0047daa5fdb05c5d113092f7044c6cafef8b1..774ad71235867315c600d2040a533038de49d150 100644
(file)
--- a/
lib/iolib/recipe/dap-lib.recipe
+++ b/
lib/iolib/recipe/dap-lib.recipe
@@
-7,8
+7,13
@@
obj/O$PB
# Paper tape listing routine - Lets see, if DAP can handle that
obj/O$PL
# Paper tape listing routine - Lets see, if DAP can handle that
obj/O$PL
+<<<<<<< dap-lib.recipe
+# O$AL ASR comfort routine
+obj/O$AL
+=======
# O$AL ASR comfort routine Hm, let's try it out....
obj/O$AL
# O$AL ASR comfort routine Hm, let's try it out....
obj/O$AL
+>>>>>>> 1.3
# Huge Line printer routine Rocking now?
obj/O$LA
# Huge Line printer routine Rocking now?
obj/O$LA