Changeset 6496 for branches/4.2/components/native/bf-cpp/src/conflicts.txt

Timestamp:

06/07/10 15:02:27 (10 years ago)

Author:

melissa

Message:

Updated bf-cpp to compile with latest ome.xml.* and loci.formats.meta.* changes.

File:

• branches/4.2/components/native/bf-cpp/src/conflicts.txt (modified) (1 diff)

branches/4.2/components/native/bf-cpp/src/conflicts.txt

@@ -51 +51 @@
 loci.formats.out.TiffWriter.COMPRESSION_LZW
 loci.formats.out.TiffWriter.COMPRESSION_JPEG
+ome.xml.model.enums.Compression.NONE
+ome.xml.model.enums.LineCap.LINE