Merge branch 'develop'0.8.0

1 files changed, 73 insertions, 73 deletions

diff --git a/app/lzo/B/win32/vc.rsp b/app/lzo/B/win32/vc.rsp
index 1cf09fe2..690bec1c 100644
--- a/app/lzo/B/win32/vc.rsp
+++ b/app/lzo/B/win32/vc.rsp
@@ -1,73 +1,73 @@
-.\lzo1.obj
-.\lzo1_99.obj
-.\lzo1a.obj
-.\lzo1a_99.obj
-.\lzo1b_1.obj
-.\lzo1b_2.obj
-.\lzo1b_3.obj
-.\lzo1b_4.obj
-.\lzo1b_5.obj
-.\lzo1b_6.obj
-.\lzo1b_7.obj
-.\lzo1b_8.obj
-.\lzo1b_9.obj
-.\lzo1b_99.obj
-.\lzo1b_9x.obj
-.\lzo1b_cc.obj
-.\lzo1b_d1.obj
-.\lzo1b_d2.obj
-.\lzo1b_rr.obj
-.\lzo1b_xx.obj
-.\lzo1c_1.obj
-.\lzo1c_2.obj
-.\lzo1c_3.obj
-.\lzo1c_4.obj
-.\lzo1c_5.obj
-.\lzo1c_6.obj
-.\lzo1c_7.obj
-.\lzo1c_8.obj
-.\lzo1c_9.obj
-.\lzo1c_99.obj
-.\lzo1c_9x.obj
-.\lzo1c_cc.obj
-.\lzo1c_d1.obj
-.\lzo1c_d2.obj
-.\lzo1c_rr.obj
-.\lzo1c_xx.obj
-.\lzo1f_1.obj
-.\lzo1f_9x.obj
-.\lzo1f_d1.obj
-.\lzo1f_d2.obj
-.\lzo1x_1.obj
-.\lzo1x_1k.obj
-.\lzo1x_1l.obj
-.\lzo1x_1o.obj
-.\lzo1x_9x.obj
-.\lzo1x_d1.obj
-.\lzo1x_d2.obj
-.\lzo1x_d3.obj
-.\lzo1x_o.obj
-.\lzo1y_1.obj
-.\lzo1y_9x.obj
-.\lzo1y_d1.obj
-.\lzo1y_d2.obj
-.\lzo1y_d3.obj
-.\lzo1y_o.obj
-.\lzo1z_9x.obj
-.\lzo1z_d1.obj
-.\lzo1z_d2.obj
-.\lzo1z_d3.obj
-.\lzo2a_9x.obj
-.\lzo2a_d1.obj
-.\lzo2a_d2.obj
-.\lzo_crc.obj
-.\lzo_init.obj
-.\lzo_ptr.obj
-.\lzo_str.obj
-.\lzo_util.obj
-.\asm\i386\obj\win32\lzo1c_s1.obj
-.\asm\i386\obj\win32\lzo1f_f1.obj
-.\asm\i386\obj\win32\lzo1x_f1.obj
-.\asm\i386\obj\win32\lzo1x_s1.obj
-.\asm\i386\obj\win32\lzo1y_f1.obj
-.\asm\i386\obj\win32\lzo1y_s1.obj
+.\lzo1.obj

+.\lzo1_99.obj

+.\lzo1a.obj

+.\lzo1a_99.obj

+.\lzo1b_1.obj

+.\lzo1b_2.obj

+.\lzo1b_3.obj

+.\lzo1b_4.obj

+.\lzo1b_5.obj

+.\lzo1b_6.obj

+.\lzo1b_7.obj

+.\lzo1b_8.obj

+.\lzo1b_9.obj

+.\lzo1b_99.obj

+.\lzo1b_9x.obj

+.\lzo1b_cc.obj

+.\lzo1b_d1.obj

+.\lzo1b_d2.obj

+.\lzo1b_rr.obj

+.\lzo1b_xx.obj

+.\lzo1c_1.obj

+.\lzo1c_2.obj

+.\lzo1c_3.obj

+.\lzo1c_4.obj

+.\lzo1c_5.obj

+.\lzo1c_6.obj

+.\lzo1c_7.obj

+.\lzo1c_8.obj

+.\lzo1c_9.obj

+.\lzo1c_99.obj

+.\lzo1c_9x.obj

+.\lzo1c_cc.obj

+.\lzo1c_d1.obj

+.\lzo1c_d2.obj

+.\lzo1c_rr.obj

+.\lzo1c_xx.obj

+.\lzo1f_1.obj

+.\lzo1f_9x.obj

+.\lzo1f_d1.obj

+.\lzo1f_d2.obj

+.\lzo1x_1.obj

+.\lzo1x_1k.obj

+.\lzo1x_1l.obj

+.\lzo1x_1o.obj

+.\lzo1x_9x.obj

+.\lzo1x_d1.obj

+.\lzo1x_d2.obj

+.\lzo1x_d3.obj

+.\lzo1x_o.obj

+.\lzo1y_1.obj

+.\lzo1y_9x.obj

+.\lzo1y_d1.obj

+.\lzo1y_d2.obj

+.\lzo1y_d3.obj

+.\lzo1y_o.obj

+.\lzo1z_9x.obj

+.\lzo1z_d1.obj

+.\lzo1z_d2.obj

+.\lzo1z_d3.obj

+.\lzo2a_9x.obj

+.\lzo2a_d1.obj

+.\lzo2a_d2.obj

+.\lzo_crc.obj

+.\lzo_init.obj

+.\lzo_ptr.obj

+.\lzo_str.obj

+.\lzo_util.obj

+.\asm\i386\obj\win32\lzo1c_s1.obj

+.\asm\i386\obj\win32\lzo1f_f1.obj

+.\asm\i386\obj\win32\lzo1x_f1.obj

+.\asm\i386\obj\win32\lzo1x_s1.obj

+.\asm\i386\obj\win32\lzo1y_f1.obj

+.\asm\i386\obj\win32\lzo1y_s1.obj