Merge

36 files changed, 0 insertions, 0 deletions

diff --git a/lzo/asm/i386/obj/coff32/lzo1c_s1.o b/lzo/asm/i386/obj/coff32/lzo1c_s1.o
index 51b4bdf2..8379dbe9 100644
--- a/lzo/asm/i386/obj/coff32/lzo1c_s1.o
+++ b/lzo/asm/i386/obj/coff32/lzo1c_s1.o
diff --git a/lzo/asm/i386/obj/coff32/lzo1c_s2.o b/lzo/asm/i386/obj/coff32/lzo1c_s2.o
index cdf10384..6a3fdf9f 100644
--- a/lzo/asm/i386/obj/coff32/lzo1c_s2.o
+++ b/lzo/asm/i386/obj/coff32/lzo1c_s2.o
diff --git a/lzo/asm/i386/obj/coff32/lzo1f_f1.o b/lzo/asm/i386/obj/coff32/lzo1f_f1.o
index 6473b9f1..bce69fa9 100644
--- a/lzo/asm/i386/obj/coff32/lzo1f_f1.o
+++ b/lzo/asm/i386/obj/coff32/lzo1f_f1.o
diff --git a/lzo/asm/i386/obj/coff32/lzo1f_f2.o b/lzo/asm/i386/obj/coff32/lzo1f_f2.o
index ac5b9637..79b5727f 100644
--- a/lzo/asm/i386/obj/coff32/lzo1f_f2.o
+++ b/lzo/asm/i386/obj/coff32/lzo1f_f2.o
diff --git a/lzo/asm/i386/obj/coff32/lzo1x_f1.o b/lzo/asm/i386/obj/coff32/lzo1x_f1.o
index f87ef01a..438d0263 100644
--- a/lzo/asm/i386/obj/coff32/lzo1x_f1.o
+++ b/lzo/asm/i386/obj/coff32/lzo1x_f1.o
diff --git a/lzo/asm/i386/obj/coff32/lzo1x_f2.o b/lzo/asm/i386/obj/coff32/lzo1x_f2.o
index df39b94c..3476817b 100644
--- a/lzo/asm/i386/obj/coff32/lzo1x_f2.o
+++ b/lzo/asm/i386/obj/coff32/lzo1x_f2.o
diff --git a/lzo/asm/i386/obj/coff32/lzo1x_s1.o b/lzo/asm/i386/obj/coff32/lzo1x_s1.o
index 91072f64..b178f0d6 100644
--- a/lzo/asm/i386/obj/coff32/lzo1x_s1.o
+++ b/lzo/asm/i386/obj/coff32/lzo1x_s1.o
diff --git a/lzo/asm/i386/obj/coff32/lzo1x_s2.o b/lzo/asm/i386/obj/coff32/lzo1x_s2.o
index db3f1bea..f45ef13a 100644
--- a/lzo/asm/i386/obj/coff32/lzo1x_s2.o
+++ b/lzo/asm/i386/obj/coff32/lzo1x_s2.o
diff --git a/lzo/asm/i386/obj/coff32/lzo1y_f1.o b/lzo/asm/i386/obj/coff32/lzo1y_f1.o
index c9560d09..f0ddcf98 100644
--- a/lzo/asm/i386/obj/coff32/lzo1y_f1.o
+++ b/lzo/asm/i386/obj/coff32/lzo1y_f1.o
diff --git a/lzo/asm/i386/obj/coff32/lzo1y_f2.o b/lzo/asm/i386/obj/coff32/lzo1y_f2.o
index 015e70ca..0ed51177 100644
--- a/lzo/asm/i386/obj/coff32/lzo1y_f2.o
+++ b/lzo/asm/i386/obj/coff32/lzo1y_f2.o
diff --git a/lzo/asm/i386/obj/coff32/lzo1y_s1.o b/lzo/asm/i386/obj/coff32/lzo1y_s1.o
index 9cb06d2a..0beadb14 100644
--- a/lzo/asm/i386/obj/coff32/lzo1y_s1.o
+++ b/lzo/asm/i386/obj/coff32/lzo1y_s1.o
diff --git a/lzo/asm/i386/obj/coff32/lzo1y_s2.o b/lzo/asm/i386/obj/coff32/lzo1y_s2.o
index 4aa10ff9..efc08299 100644
--- a/lzo/asm/i386/obj/coff32/lzo1y_s2.o
+++ b/lzo/asm/i386/obj/coff32/lzo1y_s2.o
diff --git a/lzo/asm/i386/obj/elf32/lzo1c_s1.o b/lzo/asm/i386/obj/elf32/lzo1c_s1.o
index e13ce334..e32b9531 100644
--- a/lzo/asm/i386/obj/elf32/lzo1c_s1.o
+++ b/lzo/asm/i386/obj/elf32/lzo1c_s1.o
diff --git a/lzo/asm/i386/obj/elf32/lzo1c_s2.o b/lzo/asm/i386/obj/elf32/lzo1c_s2.o
index e4357458..90622c99 100644
--- a/lzo/asm/i386/obj/elf32/lzo1c_s2.o
+++ b/lzo/asm/i386/obj/elf32/lzo1c_s2.o
diff --git a/lzo/asm/i386/obj/elf32/lzo1f_f1.o b/lzo/asm/i386/obj/elf32/lzo1f_f1.o
index d63bd62e..58e67f67 100644
--- a/lzo/asm/i386/obj/elf32/lzo1f_f1.o
+++ b/lzo/asm/i386/obj/elf32/lzo1f_f1.o
diff --git a/lzo/asm/i386/obj/elf32/lzo1f_f2.o b/lzo/asm/i386/obj/elf32/lzo1f_f2.o
index 3a70b2bd..f70f7909 100644
--- a/lzo/asm/i386/obj/elf32/lzo1f_f2.o
+++ b/lzo/asm/i386/obj/elf32/lzo1f_f2.o
diff --git a/lzo/asm/i386/obj/elf32/lzo1x_f1.o b/lzo/asm/i386/obj/elf32/lzo1x_f1.o
index a3c8de0b..eb37ab03 100644
--- a/lzo/asm/i386/obj/elf32/lzo1x_f1.o
+++ b/lzo/asm/i386/obj/elf32/lzo1x_f1.o
diff --git a/lzo/asm/i386/obj/elf32/lzo1x_f2.o b/lzo/asm/i386/obj/elf32/lzo1x_f2.o
index 29ce79ae..bb2e720c 100644
--- a/lzo/asm/i386/obj/elf32/lzo1x_f2.o
+++ b/lzo/asm/i386/obj/elf32/lzo1x_f2.o
diff --git a/lzo/asm/i386/obj/elf32/lzo1x_s1.o b/lzo/asm/i386/obj/elf32/lzo1x_s1.o
index d10769aa..6b8f4199 100644
--- a/lzo/asm/i386/obj/elf32/lzo1x_s1.o
+++ b/lzo/asm/i386/obj/elf32/lzo1x_s1.o
diff --git a/lzo/asm/i386/obj/elf32/lzo1x_s2.o b/lzo/asm/i386/obj/elf32/lzo1x_s2.o
index f9ef19f9..ce5dfc47 100644
--- a/lzo/asm/i386/obj/elf32/lzo1x_s2.o
+++ b/lzo/asm/i386/obj/elf32/lzo1x_s2.o
diff --git a/lzo/asm/i386/obj/elf32/lzo1y_f1.o b/lzo/asm/i386/obj/elf32/lzo1y_f1.o
index 7b8e00a3..431ec4e4 100644
--- a/lzo/asm/i386/obj/elf32/lzo1y_f1.o
+++ b/lzo/asm/i386/obj/elf32/lzo1y_f1.o
diff --git a/lzo/asm/i386/obj/elf32/lzo1y_f2.o b/lzo/asm/i386/obj/elf32/lzo1y_f2.o
index 6cb60ee0..4d510760 100644
--- a/lzo/asm/i386/obj/elf32/lzo1y_f2.o
+++ b/lzo/asm/i386/obj/elf32/lzo1y_f2.o
diff --git a/lzo/asm/i386/obj/elf32/lzo1y_s1.o b/lzo/asm/i386/obj/elf32/lzo1y_s1.o
index bed5c569..dcb71acf 100644
--- a/lzo/asm/i386/obj/elf32/lzo1y_s1.o
+++ b/lzo/asm/i386/obj/elf32/lzo1y_s1.o
diff --git a/lzo/asm/i386/obj/elf32/lzo1y_s2.o b/lzo/asm/i386/obj/elf32/lzo1y_s2.o
index 09c0dbf5..691d4094 100644
--- a/lzo/asm/i386/obj/elf32/lzo1y_s2.o
+++ b/lzo/asm/i386/obj/elf32/lzo1y_s2.o
diff --git a/lzo/asm/i386/obj/win32/lzo1c_s1.obj b/lzo/asm/i386/obj/win32/lzo1c_s1.obj
index e075b53b..b4d47ce2 100644
--- a/lzo/asm/i386/obj/win32/lzo1c_s1.obj
+++ b/lzo/asm/i386/obj/win32/lzo1c_s1.obj
diff --git a/lzo/asm/i386/obj/win32/lzo1c_s2.obj b/lzo/asm/i386/obj/win32/lzo1c_s2.obj
index 25457987..a67fd5c5 100644
--- a/lzo/asm/i386/obj/win32/lzo1c_s2.obj
+++ b/lzo/asm/i386/obj/win32/lzo1c_s2.obj
diff --git a/lzo/asm/i386/obj/win32/lzo1f_f1.obj b/lzo/asm/i386/obj/win32/lzo1f_f1.obj
index 41b0cf9c..231fb2b5 100644
--- a/lzo/asm/i386/obj/win32/lzo1f_f1.obj
+++ b/lzo/asm/i386/obj/win32/lzo1f_f1.obj
diff --git a/lzo/asm/i386/obj/win32/lzo1f_f2.obj b/lzo/asm/i386/obj/win32/lzo1f_f2.obj
index 3ea9d368..7c6263ac 100644
--- a/lzo/asm/i386/obj/win32/lzo1f_f2.obj
+++ b/lzo/asm/i386/obj/win32/lzo1f_f2.obj
diff --git a/lzo/asm/i386/obj/win32/lzo1x_f1.obj b/lzo/asm/i386/obj/win32/lzo1x_f1.obj
index 8760ca76..740ad7c9 100644
--- a/lzo/asm/i386/obj/win32/lzo1x_f1.obj
+++ b/lzo/asm/i386/obj/win32/lzo1x_f1.obj
diff --git a/lzo/asm/i386/obj/win32/lzo1x_f2.obj b/lzo/asm/i386/obj/win32/lzo1x_f2.obj
index ecd4b5f1..6307e9ef 100644
--- a/lzo/asm/i386/obj/win32/lzo1x_f2.obj
+++ b/lzo/asm/i386/obj/win32/lzo1x_f2.obj
diff --git a/lzo/asm/i386/obj/win32/lzo1x_s1.obj b/lzo/asm/i386/obj/win32/lzo1x_s1.obj
index 9939d442..ddd38b07 100644
--- a/lzo/asm/i386/obj/win32/lzo1x_s1.obj
+++ b/lzo/asm/i386/obj/win32/lzo1x_s1.obj
diff --git a/lzo/asm/i386/obj/win32/lzo1x_s2.obj b/lzo/asm/i386/obj/win32/lzo1x_s2.obj
index 6cde95ed..c19f527f 100644
--- a/lzo/asm/i386/obj/win32/lzo1x_s2.obj
+++ b/lzo/asm/i386/obj/win32/lzo1x_s2.obj
diff --git a/lzo/asm/i386/obj/win32/lzo1y_f1.obj b/lzo/asm/i386/obj/win32/lzo1y_f1.obj
index 343f6cf8..828cd062 100644
--- a/lzo/asm/i386/obj/win32/lzo1y_f1.obj
+++ b/lzo/asm/i386/obj/win32/lzo1y_f1.obj
diff --git a/lzo/asm/i386/obj/win32/lzo1y_f2.obj b/lzo/asm/i386/obj/win32/lzo1y_f2.obj
index fb71bb04..75640fdd 100644
--- a/lzo/asm/i386/obj/win32/lzo1y_f2.obj
+++ b/lzo/asm/i386/obj/win32/lzo1y_f2.obj
diff --git a/lzo/asm/i386/obj/win32/lzo1y_s1.obj b/lzo/asm/i386/obj/win32/lzo1y_s1.obj
index a7639f73..5b57c8e0 100644
--- a/lzo/asm/i386/obj/win32/lzo1y_s1.obj
+++ b/lzo/asm/i386/obj/win32/lzo1y_s1.obj
diff --git a/lzo/asm/i386/obj/win32/lzo1y_s2.obj b/lzo/asm/i386/obj/win32/lzo1y_s2.obj
index 2b444fd7..38b025ee 100644
--- a/lzo/asm/i386/obj/win32/lzo1y_s2.obj
+++ b/lzo/asm/i386/obj/win32/lzo1y_s2.obj