]> granicus.if.org Git - file/commitdiff
comment out things that will cause conflicts.
authorChristos Zoulas <christos@zoulas.com>
Sat, 5 Aug 2000 18:22:15 +0000 (18:22 +0000)
committerChristos Zoulas <christos@zoulas.com>
Sat, 5 Aug 2000 18:22:15 +0000 (18:22 +0000)
magic/Magdir/apple

index 82ee99444b148e76a96bdc24837c8250ff0b109d..35dd435727d8bd7f3c66c72743baf1392084e7cc 100644 (file)
 # 
 # This will not identify ORCA/M source files, since those have
 # some sort of date code instead of the two zero bytes at 6 and 7
-
-4       belong&0xff00ffff       0x01000000      ORCA/EZ assembler source data
->5      byte                    x               \b, build number %d
+# XXX Conflicts with ELF
+#4       belong&0xff00ffff       0x01000000      ORCA/EZ assembler source data
+#>5      byte                    x               \b, build number %d
 
 # Broderbund Fantavision
 #
 # I don't know what these values really mean, but they seem to recur.
 # Will they cause too many conflicts?
 
-2      belong&0xFF00FF         0x040008        Fantavision movie data
+# Probably :-)
+#2     belong&0xFF00FF         0x040008        Fantavision movie data
 
 # Some attempts at images.
 #