diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..001c5d3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+
+
+*o
+*.d
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/config/ftconfig.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/config/ftconfig.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/config/ftconfig.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/config/ftconfig.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/config/ftheader.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/config/ftheader.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/config/ftheader.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/config/ftheader.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/config/ftmodule.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/config/ftmodule.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/config/ftmodule.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/config/ftmodule.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/config/ftoption.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/config/ftoption.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/config/ftoption.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/config/ftoption.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/config/ftstdlib.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/config/ftstdlib.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/config/ftstdlib.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/config/ftstdlib.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/freetype.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/freetype.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/freetype.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/freetype.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftadvanc.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftadvanc.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftadvanc.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftadvanc.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftbbox.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftbbox.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftbbox.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftbbox.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftbdf.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftbdf.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftbdf.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftbdf.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftbitmap.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftbitmap.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftbitmap.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftbitmap.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftbzip2.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftbzip2.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftbzip2.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftbzip2.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftcache.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftcache.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftcache.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftcache.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftchapters.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftchapters.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftchapters.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftchapters.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftcid.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftcid.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftcid.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftcid.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftdriver.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftdriver.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftdriver.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftdriver.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/fterrdef.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/fterrdef.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/fterrdef.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/fterrdef.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/fterrors.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/fterrors.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/fterrors.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/fterrors.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftfntfmt.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftfntfmt.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftfntfmt.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftfntfmt.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftgasp.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftgasp.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftgasp.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftgasp.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftglyph.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftglyph.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftglyph.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftglyph.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftgxval.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftgxval.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftgxval.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftgxval.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftgzip.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftgzip.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftgzip.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftgzip.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftimage.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftimage.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftimage.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftimage.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftincrem.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftincrem.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftincrem.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftincrem.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftlcdfil.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftlcdfil.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftlcdfil.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftlcdfil.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftlist.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftlist.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftlist.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftlist.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftlzw.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftlzw.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftlzw.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftlzw.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftmac.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftmac.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftmac.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftmac.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftmm.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftmm.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftmm.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftmm.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftmodapi.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftmodapi.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftmodapi.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftmodapi.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftmoderr.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftmoderr.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftmoderr.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftmoderr.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftotval.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftotval.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftotval.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftotval.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftoutln.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftoutln.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftoutln.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftoutln.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftparams.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftparams.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftparams.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftparams.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftpfr.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftpfr.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftpfr.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftpfr.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftrender.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftrender.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftrender.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftrender.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftsizes.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftsizes.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftsizes.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftsizes.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftsnames.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftsnames.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftsnames.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftsnames.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftstroke.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftstroke.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftstroke.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftstroke.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftsynth.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftsynth.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftsynth.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftsynth.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftsystem.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftsystem.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftsystem.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftsystem.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/fttrigon.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/fttrigon.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/fttrigon.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/fttrigon.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/fttypes.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/fttypes.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/fttypes.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/fttypes.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftwinfnt.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftwinfnt.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftwinfnt.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ftwinfnt.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/t1tables.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/t1tables.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/t1tables.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/t1tables.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ttnameid.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ttnameid.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ttnameid.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/ttnameid.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/tttables.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/tttables.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/tttables.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/tttables.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/tttags.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/tttags.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/freetype/tttags.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/freetype/tttags.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/ft2build.h b/clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/ft2build.h
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/ft2build.h
rename to clusterApp/3psw/freetype-2.9_MinGW/include/freetype2/ft2build.h
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/lib/cmake/freetype/freetype-config-noconfig.cmake b/clusterApp/3psw/freetype-2.9_MinGW/lib/cmake/freetype/freetype-config-noconfig.cmake
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/lib/cmake/freetype/freetype-config-noconfig.cmake
rename to clusterApp/3psw/freetype-2.9_MinGW/lib/cmake/freetype/freetype-config-noconfig.cmake
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/lib/cmake/freetype/freetype-config.cmake b/clusterApp/3psw/freetype-2.9_MinGW/lib/cmake/freetype/freetype-config.cmake
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/lib/cmake/freetype/freetype-config.cmake
rename to clusterApp/3psw/freetype-2.9_MinGW/lib/cmake/freetype/freetype-config.cmake
diff --git a/insDavi2.0/3psw/freetype-2.9_MinGW/lib/libfreetype.a b/clusterApp/3psw/freetype-2.9_MinGW/lib/libfreetype.a
similarity index 100%
rename from insDavi2.0/3psw/freetype-2.9_MinGW/lib/libfreetype.a
rename to clusterApp/3psw/freetype-2.9_MinGW/lib/libfreetype.a
diff --git a/insDavi2.0/3psw/glew-2.1.0/LICENSE.txt b/clusterApp/3psw/glew-2.1.0/LICENSE.txt
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/LICENSE.txt
rename to clusterApp/3psw/glew-2.1.0/LICENSE.txt
diff --git a/insDavi2.0/3psw/glew-2.1.0/bin/Release/Win32/glew32.dll b/clusterApp/3psw/glew-2.1.0/bin/Release/Win32/glew32.dll
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/bin/Release/Win32/glew32.dll
rename to clusterApp/3psw/glew-2.1.0/bin/Release/Win32/glew32.dll
diff --git a/insDavi2.0/3psw/glew-2.1.0/bin/Release/Win32/glewinfo.exe b/clusterApp/3psw/glew-2.1.0/bin/Release/Win32/glewinfo.exe
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/bin/Release/Win32/glewinfo.exe
rename to clusterApp/3psw/glew-2.1.0/bin/Release/Win32/glewinfo.exe
diff --git a/insDavi2.0/3psw/glew-2.1.0/bin/Release/Win32/visualinfo.exe b/clusterApp/3psw/glew-2.1.0/bin/Release/Win32/visualinfo.exe
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/bin/Release/Win32/visualinfo.exe
rename to clusterApp/3psw/glew-2.1.0/bin/Release/Win32/visualinfo.exe
diff --git a/insDavi2.0/3psw/glew-2.1.0/bin/Release/x64/0/glewinfo.txt b/clusterApp/3psw/glew-2.1.0/bin/Release/x64/0/glewinfo.txt
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/bin/Release/x64/0/glewinfo.txt
rename to clusterApp/3psw/glew-2.1.0/bin/Release/x64/0/glewinfo.txt
diff --git a/insDavi2.0/3psw/glew-2.1.0/bin/Release/x64/0/visualinfo.txt b/clusterApp/3psw/glew-2.1.0/bin/Release/x64/0/visualinfo.txt
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/bin/Release/x64/0/visualinfo.txt
rename to clusterApp/3psw/glew-2.1.0/bin/Release/x64/0/visualinfo.txt
diff --git a/insDavi2.0/3psw/glew-2.1.0/bin/Release/x64/glew32.dll b/clusterApp/3psw/glew-2.1.0/bin/Release/x64/glew32.dll
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/bin/Release/x64/glew32.dll
rename to clusterApp/3psw/glew-2.1.0/bin/Release/x64/glew32.dll
diff --git a/insDavi2.0/3psw/glew-2.1.0/bin/Release/x64/glewinfo.exe b/clusterApp/3psw/glew-2.1.0/bin/Release/x64/glewinfo.exe
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/bin/Release/x64/glewinfo.exe
rename to clusterApp/3psw/glew-2.1.0/bin/Release/x64/glewinfo.exe
diff --git a/insDavi2.0/3psw/glew-2.1.0/bin/Release/x64/glewinfo.txt b/clusterApp/3psw/glew-2.1.0/bin/Release/x64/glewinfo.txt
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/bin/Release/x64/glewinfo.txt
rename to clusterApp/3psw/glew-2.1.0/bin/Release/x64/glewinfo.txt
diff --git a/insDavi2.0/3psw/glew-2.1.0/bin/Release/x64/visualinfo.exe b/clusterApp/3psw/glew-2.1.0/bin/Release/x64/visualinfo.exe
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/bin/Release/x64/visualinfo.exe
rename to clusterApp/3psw/glew-2.1.0/bin/Release/x64/visualinfo.exe
diff --git a/insDavi2.0/3psw/glew-2.1.0/bin/Release/x64/visualinfo.txt b/clusterApp/3psw/glew-2.1.0/bin/Release/x64/visualinfo.txt
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/bin/Release/x64/visualinfo.txt
rename to clusterApp/3psw/glew-2.1.0/bin/Release/x64/visualinfo.txt
diff --git a/insDavi2.0/3psw/glew-2.1.0/doc/advanced.html b/clusterApp/3psw/glew-2.1.0/doc/advanced.html
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/doc/advanced.html
rename to clusterApp/3psw/glew-2.1.0/doc/advanced.html
diff --git a/insDavi2.0/3psw/glew-2.1.0/doc/basic.html b/clusterApp/3psw/glew-2.1.0/doc/basic.html
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/doc/basic.html
rename to clusterApp/3psw/glew-2.1.0/doc/basic.html
diff --git a/insDavi2.0/3psw/glew-2.1.0/doc/build.html b/clusterApp/3psw/glew-2.1.0/doc/build.html
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/doc/build.html
rename to clusterApp/3psw/glew-2.1.0/doc/build.html
diff --git a/insDavi2.0/3psw/glew-2.1.0/doc/credits.html b/clusterApp/3psw/glew-2.1.0/doc/credits.html
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/doc/credits.html
rename to clusterApp/3psw/glew-2.1.0/doc/credits.html
diff --git a/insDavi2.0/3psw/glew-2.1.0/doc/github.png b/clusterApp/3psw/glew-2.1.0/doc/github.png
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/doc/github.png
rename to clusterApp/3psw/glew-2.1.0/doc/github.png
diff --git a/insDavi2.0/3psw/glew-2.1.0/doc/glew.css b/clusterApp/3psw/glew-2.1.0/doc/glew.css
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/doc/glew.css
rename to clusterApp/3psw/glew-2.1.0/doc/glew.css
diff --git a/insDavi2.0/3psw/glew-2.1.0/doc/glew.html b/clusterApp/3psw/glew-2.1.0/doc/glew.html
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/doc/glew.html
rename to clusterApp/3psw/glew-2.1.0/doc/glew.html
diff --git a/insDavi2.0/3psw/glew-2.1.0/doc/glew.png b/clusterApp/3psw/glew-2.1.0/doc/glew.png
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/doc/glew.png
rename to clusterApp/3psw/glew-2.1.0/doc/glew.png
diff --git a/insDavi2.0/3psw/glew-2.1.0/doc/glew.txt b/clusterApp/3psw/glew-2.1.0/doc/glew.txt
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/doc/glew.txt
rename to clusterApp/3psw/glew-2.1.0/doc/glew.txt
diff --git a/insDavi2.0/3psw/glew-2.1.0/doc/glxew.html b/clusterApp/3psw/glew-2.1.0/doc/glxew.html
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/doc/glxew.html
rename to clusterApp/3psw/glew-2.1.0/doc/glxew.html
diff --git a/insDavi2.0/3psw/glew-2.1.0/doc/gpl.txt b/clusterApp/3psw/glew-2.1.0/doc/gpl.txt
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/doc/gpl.txt
rename to clusterApp/3psw/glew-2.1.0/doc/gpl.txt
diff --git a/insDavi2.0/3psw/glew-2.1.0/doc/index.html b/clusterApp/3psw/glew-2.1.0/doc/index.html
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/doc/index.html
rename to clusterApp/3psw/glew-2.1.0/doc/index.html
diff --git a/insDavi2.0/3psw/glew-2.1.0/doc/install.html b/clusterApp/3psw/glew-2.1.0/doc/install.html
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/doc/install.html
rename to clusterApp/3psw/glew-2.1.0/doc/install.html
diff --git a/insDavi2.0/3psw/glew-2.1.0/doc/khronos.txt b/clusterApp/3psw/glew-2.1.0/doc/khronos.txt
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/doc/khronos.txt
rename to clusterApp/3psw/glew-2.1.0/doc/khronos.txt
diff --git a/insDavi2.0/3psw/glew-2.1.0/doc/log.html b/clusterApp/3psw/glew-2.1.0/doc/log.html
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/doc/log.html
rename to clusterApp/3psw/glew-2.1.0/doc/log.html
diff --git a/insDavi2.0/3psw/glew-2.1.0/doc/mesa.txt b/clusterApp/3psw/glew-2.1.0/doc/mesa.txt
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/doc/mesa.txt
rename to clusterApp/3psw/glew-2.1.0/doc/mesa.txt
diff --git a/insDavi2.0/3psw/glew-2.1.0/doc/new.png b/clusterApp/3psw/glew-2.1.0/doc/new.png
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/doc/new.png
rename to clusterApp/3psw/glew-2.1.0/doc/new.png
diff --git a/insDavi2.0/3psw/glew-2.1.0/doc/ogl_sm.jpg b/clusterApp/3psw/glew-2.1.0/doc/ogl_sm.jpg
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/doc/ogl_sm.jpg
rename to clusterApp/3psw/glew-2.1.0/doc/ogl_sm.jpg
diff --git a/insDavi2.0/3psw/glew-2.1.0/doc/travis.png b/clusterApp/3psw/glew-2.1.0/doc/travis.png
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/doc/travis.png
rename to clusterApp/3psw/glew-2.1.0/doc/travis.png
diff --git a/insDavi2.0/3psw/glew-2.1.0/doc/wglew.html b/clusterApp/3psw/glew-2.1.0/doc/wglew.html
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/doc/wglew.html
rename to clusterApp/3psw/glew-2.1.0/doc/wglew.html
diff --git a/insDavi2.0/3psw/glew-2.1.0/include/GL/eglew.h b/clusterApp/3psw/glew-2.1.0/include/GL/eglew.h
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/include/GL/eglew.h
rename to clusterApp/3psw/glew-2.1.0/include/GL/eglew.h
diff --git a/insDavi2.0/3psw/glew-2.1.0/include/GL/glew.h b/clusterApp/3psw/glew-2.1.0/include/GL/glew.h
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/include/GL/glew.h
rename to clusterApp/3psw/glew-2.1.0/include/GL/glew.h
diff --git a/insDavi2.0/3psw/glew-2.1.0/include/GL/glxew.h b/clusterApp/3psw/glew-2.1.0/include/GL/glxew.h
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/include/GL/glxew.h
rename to clusterApp/3psw/glew-2.1.0/include/GL/glxew.h
diff --git a/insDavi2.0/3psw/glew-2.1.0/include/GL/wglew.h b/clusterApp/3psw/glew-2.1.0/include/GL/wglew.h
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/include/GL/wglew.h
rename to clusterApp/3psw/glew-2.1.0/include/GL/wglew.h
diff --git a/insDavi2.0/3psw/glew-2.1.0/lib/Release/Win32/glew32.lib b/clusterApp/3psw/glew-2.1.0/lib/Release/Win32/glew32.lib
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/lib/Release/Win32/glew32.lib
rename to clusterApp/3psw/glew-2.1.0/lib/Release/Win32/glew32.lib
diff --git a/insDavi2.0/3psw/glew-2.1.0/lib/Release/Win32/glew32s.lib b/clusterApp/3psw/glew-2.1.0/lib/Release/Win32/glew32s.lib
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/lib/Release/Win32/glew32s.lib
rename to clusterApp/3psw/glew-2.1.0/lib/Release/Win32/glew32s.lib
diff --git a/insDavi2.0/3psw/glew-2.1.0/lib/Release/x64/glew32.lib b/clusterApp/3psw/glew-2.1.0/lib/Release/x64/glew32.lib
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/lib/Release/x64/glew32.lib
rename to clusterApp/3psw/glew-2.1.0/lib/Release/x64/glew32.lib
diff --git a/insDavi2.0/3psw/glew-2.1.0/lib/Release/x64/glew32s.lib b/clusterApp/3psw/glew-2.1.0/lib/Release/x64/glew32s.lib
similarity index 100%
rename from insDavi2.0/3psw/glew-2.1.0/lib/Release/x64/glew32s.lib
rename to clusterApp/3psw/glew-2.1.0/lib/Release/x64/glew32s.lib
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/Makefile.am b/clusterApp/3psw/jpegsr9c/jpeg-9c/Makefile.am
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/Makefile.am
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/Makefile.am
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/Makefile.in b/clusterApp/3psw/jpegsr9c/jpeg-9c/Makefile.in
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/Makefile.in
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/Makefile.in
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/README b/clusterApp/3psw/jpegsr9c/jpeg-9c/README
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/README
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/README
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/aclocal.m4 b/clusterApp/3psw/jpegsr9c/jpeg-9c/aclocal.m4
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/aclocal.m4
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/aclocal.m4
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/ar-lib b/clusterApp/3psw/jpegsr9c/jpeg-9c/ar-lib
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/ar-lib
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/ar-lib
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/cderror.h b/clusterApp/3psw/jpegsr9c/jpeg-9c/cderror.h
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/cderror.h
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/cderror.h
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/cdjpeg.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/cdjpeg.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/cdjpeg.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/cdjpeg.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/cdjpeg.h b/clusterApp/3psw/jpegsr9c/jpeg-9c/cdjpeg.h
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/cdjpeg.h
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/cdjpeg.h
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/change.log b/clusterApp/3psw/jpegsr9c/jpeg-9c/change.log
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/change.log
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/change.log
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/cjpeg.1 b/clusterApp/3psw/jpegsr9c/jpeg-9c/cjpeg.1
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/cjpeg.1
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/cjpeg.1
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/cjpeg.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/cjpeg.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/cjpeg.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/cjpeg.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/cjpeg.exe b/clusterApp/3psw/jpegsr9c/jpeg-9c/cjpeg.exe
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/cjpeg.exe
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/cjpeg.exe
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/ckconfig.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/ckconfig.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/ckconfig.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/ckconfig.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/coderules.txt b/clusterApp/3psw/jpegsr9c/jpeg-9c/coderules.txt
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/coderules.txt
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/coderules.txt
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/compile b/clusterApp/3psw/jpegsr9c/jpeg-9c/compile
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/compile
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/compile
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/config.guess b/clusterApp/3psw/jpegsr9c/jpeg-9c/config.guess
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/config.guess
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/config.guess
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/config.sub b/clusterApp/3psw/jpegsr9c/jpeg-9c/config.sub
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/config.sub
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/config.sub
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/configure b/clusterApp/3psw/jpegsr9c/jpeg-9c/configure
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/configure
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/configure
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/configure.ac b/clusterApp/3psw/jpegsr9c/jpeg-9c/configure.ac
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/configure.ac
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/configure.ac
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/depcomp b/clusterApp/3psw/jpegsr9c/jpeg-9c/depcomp
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/depcomp
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/depcomp
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/djpeg.1 b/clusterApp/3psw/jpegsr9c/jpeg-9c/djpeg.1
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/djpeg.1
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/djpeg.1
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/djpeg.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/djpeg.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/djpeg.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/djpeg.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/djpeg.exe b/clusterApp/3psw/jpegsr9c/jpeg-9c/djpeg.exe
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/djpeg.exe
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/djpeg.exe
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/example.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/example.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/example.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/example.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/filelist.txt b/clusterApp/3psw/jpegsr9c/jpeg-9c/filelist.txt
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/filelist.txt
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/filelist.txt
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/install-sh b/clusterApp/3psw/jpegsr9c/jpeg-9c/install-sh
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/install-sh
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/install-sh
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/install.txt b/clusterApp/3psw/jpegsr9c/jpeg-9c/install.txt
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/install.txt
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/install.txt
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jaricom.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jaricom.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jaricom.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jaricom.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcapimin.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jcapimin.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcapimin.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jcapimin.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcapistd.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jcapistd.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcapistd.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jcapistd.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcarith.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jcarith.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcarith.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jcarith.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jccoefct.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jccoefct.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jccoefct.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jccoefct.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jccolor.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jccolor.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jccolor.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jccolor.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcdctmgr.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jcdctmgr.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcdctmgr.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jcdctmgr.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jchuff.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jchuff.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jchuff.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jchuff.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcinit.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jcinit.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcinit.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jcinit.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcmainct.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jcmainct.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcmainct.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jcmainct.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcmarker.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jcmarker.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcmarker.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jcmarker.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcmaster.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jcmaster.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcmaster.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jcmaster.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcomapi.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jcomapi.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcomapi.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jcomapi.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jconfig.bcc b/clusterApp/3psw/jpegsr9c/jpeg-9c/jconfig.bcc
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jconfig.bcc
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jconfig.bcc
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jconfig.cfg b/clusterApp/3psw/jpegsr9c/jpeg-9c/jconfig.cfg
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jconfig.cfg
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jconfig.cfg
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jconfig.dj b/clusterApp/3psw/jpegsr9c/jpeg-9c/jconfig.dj
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jconfig.dj
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jconfig.dj
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jconfig.h b/clusterApp/3psw/jpegsr9c/jpeg-9c/jconfig.h
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jconfig.h
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jconfig.h
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jconfig.mac b/clusterApp/3psw/jpegsr9c/jpeg-9c/jconfig.mac
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jconfig.mac
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jconfig.mac
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jconfig.manx b/clusterApp/3psw/jpegsr9c/jpeg-9c/jconfig.manx
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jconfig.manx
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jconfig.manx
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jconfig.mc6 b/clusterApp/3psw/jpegsr9c/jpeg-9c/jconfig.mc6
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jconfig.mc6
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jconfig.mc6
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jconfig.sas b/clusterApp/3psw/jpegsr9c/jpeg-9c/jconfig.sas
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jconfig.sas
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jconfig.sas
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jconfig.st b/clusterApp/3psw/jpegsr9c/jpeg-9c/jconfig.st
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jconfig.st
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jconfig.st
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jconfig.txt b/clusterApp/3psw/jpegsr9c/jpeg-9c/jconfig.txt
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jconfig.txt
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jconfig.txt
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jconfig.vc b/clusterApp/3psw/jpegsr9c/jpeg-9c/jconfig.vc
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jconfig.vc
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jconfig.vc
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jconfig.vms b/clusterApp/3psw/jpegsr9c/jpeg-9c/jconfig.vms
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jconfig.vms
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jconfig.vms
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jconfig.wat b/clusterApp/3psw/jpegsr9c/jpeg-9c/jconfig.wat
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jconfig.wat
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jconfig.wat
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcparam.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jcparam.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcparam.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jcparam.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcprepct.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jcprepct.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcprepct.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jcprepct.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcsample.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jcsample.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcsample.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jcsample.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jctrans.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jctrans.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jctrans.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jctrans.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdapimin.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jdapimin.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdapimin.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jdapimin.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdapistd.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jdapistd.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdapistd.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jdapistd.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdarith.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jdarith.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdarith.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jdarith.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdatadst.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jdatadst.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdatadst.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jdatadst.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdatasrc.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jdatasrc.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdatasrc.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jdatasrc.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdcoefct.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jdcoefct.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdcoefct.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jdcoefct.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdcolor.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jdcolor.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdcolor.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jdcolor.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdct.h b/clusterApp/3psw/jpegsr9c/jpeg-9c/jdct.h
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdct.h
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jdct.h
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jddctmgr.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jddctmgr.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jddctmgr.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jddctmgr.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdhuff.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jdhuff.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdhuff.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jdhuff.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdinput.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jdinput.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdinput.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jdinput.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdmainct.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jdmainct.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdmainct.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jdmainct.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdmarker.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jdmarker.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdmarker.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jdmarker.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdmaster.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jdmaster.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdmaster.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jdmaster.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdmerge.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jdmerge.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdmerge.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jdmerge.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdosabcc.obj b/clusterApp/3psw/jpegsr9c/jpeg-9c/jdosabcc.obj
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdosabcc.obj
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jdosabcc.obj
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdosamsc.obj b/clusterApp/3psw/jpegsr9c/jpeg-9c/jdosamsc.obj
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdosamsc.obj
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jdosamsc.obj
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdosaobj.txt b/clusterApp/3psw/jpegsr9c/jpeg-9c/jdosaobj.txt
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdosaobj.txt
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jdosaobj.txt
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdpostct.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jdpostct.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdpostct.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jdpostct.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdsample.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jdsample.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdsample.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jdsample.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdtrans.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jdtrans.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdtrans.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jdtrans.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jerror.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jerror.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jerror.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jerror.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jerror.h b/clusterApp/3psw/jpegsr9c/jpeg-9c/jerror.h
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jerror.h
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jerror.h
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jfdctflt.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jfdctflt.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jfdctflt.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jfdctflt.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jfdctfst.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jfdctfst.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jfdctfst.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jfdctfst.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jfdctint.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jfdctint.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jfdctint.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jfdctint.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jidctflt.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jidctflt.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jidctflt.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jidctflt.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jidctfst.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jidctfst.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jidctfst.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jidctfst.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jidctint.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jidctint.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jidctint.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jidctint.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jinclude.h b/clusterApp/3psw/jpegsr9c/jpeg-9c/jinclude.h
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jinclude.h
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jinclude.h
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jmemansi.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jmemansi.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jmemansi.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jmemansi.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jmemdos.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jmemdos.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jmemdos.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jmemdos.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jmemdosa.asm b/clusterApp/3psw/jpegsr9c/jpeg-9c/jmemdosa.asm
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jmemdosa.asm
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jmemdosa.asm
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jmemmac.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jmemmac.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jmemmac.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jmemmac.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jmemmgr.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jmemmgr.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jmemmgr.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jmemmgr.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jmemname.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jmemname.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jmemname.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jmemname.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jmemnobs.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jmemnobs.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jmemnobs.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jmemnobs.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jmemsys.h b/clusterApp/3psw/jpegsr9c/jpeg-9c/jmemsys.h
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jmemsys.h
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jmemsys.h
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jmorecfg.h b/clusterApp/3psw/jpegsr9c/jpeg-9c/jmorecfg.h
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jmorecfg.h
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jmorecfg.h
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jpegint.h b/clusterApp/3psw/jpegsr9c/jpeg-9c/jpegint.h
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jpegint.h
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jpegint.h
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jpeglib.h b/clusterApp/3psw/jpegsr9c/jpeg-9c/jpeglib.h
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jpeglib.h
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jpeglib.h
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jpegtran.1 b/clusterApp/3psw/jpegsr9c/jpeg-9c/jpegtran.1
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jpegtran.1
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jpegtran.1
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jpegtran.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jpegtran.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jpegtran.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jpegtran.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jpegtran.exe b/clusterApp/3psw/jpegsr9c/jpeg-9c/jpegtran.exe
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jpegtran.exe
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jpegtran.exe
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jquant1.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jquant1.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jquant1.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jquant1.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jquant2.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jquant2.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jquant2.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jquant2.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jutils.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/jutils.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jutils.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jutils.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jversion.h b/clusterApp/3psw/jpegsr9c/jpeg-9c/jversion.h
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/jversion.h
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/jversion.h
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/libjpeg.a b/clusterApp/3psw/jpegsr9c/jpeg-9c/libjpeg.a
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/libjpeg.a
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/libjpeg.a
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/libjpeg.map b/clusterApp/3psw/jpegsr9c/jpeg-9c/libjpeg.map
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/libjpeg.map
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/libjpeg.map
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/libjpeg.pc.in b/clusterApp/3psw/jpegsr9c/jpeg-9c/libjpeg.pc.in
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/libjpeg.pc.in
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/libjpeg.pc.in
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/libjpeg.txt b/clusterApp/3psw/jpegsr9c/jpeg-9c/libjpeg.txt
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/libjpeg.txt
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/libjpeg.txt
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/ltmain.sh b/clusterApp/3psw/jpegsr9c/jpeg-9c/ltmain.sh
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/ltmain.sh
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/ltmain.sh
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makcjpeg.st b/clusterApp/3psw/jpegsr9c/jpeg-9c/makcjpeg.st
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makcjpeg.st
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makcjpeg.st
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makdjpeg.st b/clusterApp/3psw/jpegsr9c/jpeg-9c/makdjpeg.st
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makdjpeg.st
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makdjpeg.st
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makeadsw.vc6 b/clusterApp/3psw/jpegsr9c/jpeg-9c/makeadsw.vc6
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makeadsw.vc6
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makeadsw.vc6
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makeasln.v15 b/clusterApp/3psw/jpegsr9c/jpeg-9c/makeasln.v15
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makeasln.v15
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makeasln.v15
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makecdep.vc6 b/clusterApp/3psw/jpegsr9c/jpeg-9c/makecdep.vc6
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makecdep.vc6
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makecdep.vc6
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makecdsp.vc6 b/clusterApp/3psw/jpegsr9c/jpeg-9c/makecdsp.vc6
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makecdsp.vc6
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makecdsp.vc6
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makecfil.v15 b/clusterApp/3psw/jpegsr9c/jpeg-9c/makecfil.v15
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makecfil.v15
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makecfil.v15
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makecmak.vc6 b/clusterApp/3psw/jpegsr9c/jpeg-9c/makecmak.vc6
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makecmak.vc6
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makecmak.vc6
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makecvcx.v15 b/clusterApp/3psw/jpegsr9c/jpeg-9c/makecvcx.v15
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makecvcx.v15
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makecvcx.v15
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makeddep.vc6 b/clusterApp/3psw/jpegsr9c/jpeg-9c/makeddep.vc6
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makeddep.vc6
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makeddep.vc6
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makeddsp.vc6 b/clusterApp/3psw/jpegsr9c/jpeg-9c/makeddsp.vc6
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makeddsp.vc6
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makeddsp.vc6
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makedfil.v15 b/clusterApp/3psw/jpegsr9c/jpeg-9c/makedfil.v15
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makedfil.v15
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makedfil.v15
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makedmak.vc6 b/clusterApp/3psw/jpegsr9c/jpeg-9c/makedmak.vc6
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makedmak.vc6
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makedmak.vc6
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makedvcx.v15 b/clusterApp/3psw/jpegsr9c/jpeg-9c/makedvcx.v15
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makedvcx.v15
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makedvcx.v15
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makefile b/clusterApp/3psw/jpegsr9c/jpeg-9c/makefile
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makefile
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makefile
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makefile.ansi b/clusterApp/3psw/jpegsr9c/jpeg-9c/makefile.ansi
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makefile.ansi
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makefile.ansi
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makefile.b32 b/clusterApp/3psw/jpegsr9c/jpeg-9c/makefile.b32
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makefile.b32
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makefile.b32
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makefile.bcc b/clusterApp/3psw/jpegsr9c/jpeg-9c/makefile.bcc
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makefile.bcc
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makefile.bcc
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makefile.dj b/clusterApp/3psw/jpegsr9c/jpeg-9c/makefile.dj
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makefile.dj
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makefile.dj
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makefile.manx b/clusterApp/3psw/jpegsr9c/jpeg-9c/makefile.manx
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makefile.manx
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makefile.manx
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makefile.mc6 b/clusterApp/3psw/jpegsr9c/jpeg-9c/makefile.mc6
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makefile.mc6
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makefile.mc6
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makefile.mms b/clusterApp/3psw/jpegsr9c/jpeg-9c/makefile.mms
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makefile.mms
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makefile.mms
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makefile.sas b/clusterApp/3psw/jpegsr9c/jpeg-9c/makefile.sas
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makefile.sas
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makefile.sas
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makefile.unix b/clusterApp/3psw/jpegsr9c/jpeg-9c/makefile.unix
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makefile.unix
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makefile.unix
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makefile.vc b/clusterApp/3psw/jpegsr9c/jpeg-9c/makefile.vc
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makefile.vc
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makefile.vc
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makefile.vms b/clusterApp/3psw/jpegsr9c/jpeg-9c/makefile.vms
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makefile.vms
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makefile.vms
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makefile.vs b/clusterApp/3psw/jpegsr9c/jpeg-9c/makefile.vs
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makefile.vs
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makefile.vs
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makefile.wat b/clusterApp/3psw/jpegsr9c/jpeg-9c/makefile.wat
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makefile.wat
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makefile.wat
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makejdep.vc6 b/clusterApp/3psw/jpegsr9c/jpeg-9c/makejdep.vc6
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makejdep.vc6
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makejdep.vc6
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makejdsp.vc6 b/clusterApp/3psw/jpegsr9c/jpeg-9c/makejdsp.vc6
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makejdsp.vc6
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makejdsp.vc6
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makejdsw.vc6 b/clusterApp/3psw/jpegsr9c/jpeg-9c/makejdsw.vc6
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makejdsw.vc6
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makejdsw.vc6
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makejfil.v15 b/clusterApp/3psw/jpegsr9c/jpeg-9c/makejfil.v15
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makejfil.v15
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makejfil.v15
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makejmak.vc6 b/clusterApp/3psw/jpegsr9c/jpeg-9c/makejmak.vc6
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makejmak.vc6
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makejmak.vc6
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makejsln.v15 b/clusterApp/3psw/jpegsr9c/jpeg-9c/makejsln.v15
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makejsln.v15
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makejsln.v15
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makejvcx.v15 b/clusterApp/3psw/jpegsr9c/jpeg-9c/makejvcx.v15
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makejvcx.v15
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makejvcx.v15
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makeproj.mac b/clusterApp/3psw/jpegsr9c/jpeg-9c/makeproj.mac
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makeproj.mac
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makeproj.mac
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makerdep.vc6 b/clusterApp/3psw/jpegsr9c/jpeg-9c/makerdep.vc6
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makerdep.vc6
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makerdep.vc6
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makerdsp.vc6 b/clusterApp/3psw/jpegsr9c/jpeg-9c/makerdsp.vc6
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makerdsp.vc6
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makerdsp.vc6
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makerfil.v15 b/clusterApp/3psw/jpegsr9c/jpeg-9c/makerfil.v15
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makerfil.v15
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makerfil.v15
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makermak.vc6 b/clusterApp/3psw/jpegsr9c/jpeg-9c/makermak.vc6
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makermak.vc6
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makermak.vc6
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makervcx.v15 b/clusterApp/3psw/jpegsr9c/jpeg-9c/makervcx.v15
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makervcx.v15
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makervcx.v15
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/maketdep.vc6 b/clusterApp/3psw/jpegsr9c/jpeg-9c/maketdep.vc6
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/maketdep.vc6
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/maketdep.vc6
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/maketdsp.vc6 b/clusterApp/3psw/jpegsr9c/jpeg-9c/maketdsp.vc6
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/maketdsp.vc6
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/maketdsp.vc6
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/maketfil.v15 b/clusterApp/3psw/jpegsr9c/jpeg-9c/maketfil.v15
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/maketfil.v15
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/maketfil.v15
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/maketmak.vc6 b/clusterApp/3psw/jpegsr9c/jpeg-9c/maketmak.vc6
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/maketmak.vc6
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/maketmak.vc6
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/maketvcx.v15 b/clusterApp/3psw/jpegsr9c/jpeg-9c/maketvcx.v15
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/maketvcx.v15
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/maketvcx.v15
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makewdep.vc6 b/clusterApp/3psw/jpegsr9c/jpeg-9c/makewdep.vc6
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makewdep.vc6
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makewdep.vc6
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makewdsp.vc6 b/clusterApp/3psw/jpegsr9c/jpeg-9c/makewdsp.vc6
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makewdsp.vc6
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makewdsp.vc6
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makewfil.v15 b/clusterApp/3psw/jpegsr9c/jpeg-9c/makewfil.v15
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makewfil.v15
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makewfil.v15
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makewmak.vc6 b/clusterApp/3psw/jpegsr9c/jpeg-9c/makewmak.vc6
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makewmak.vc6
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makewmak.vc6
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makewvcx.v15 b/clusterApp/3psw/jpegsr9c/jpeg-9c/makewvcx.v15
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makewvcx.v15
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makewvcx.v15
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makljpeg.st b/clusterApp/3psw/jpegsr9c/jpeg-9c/makljpeg.st
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makljpeg.st
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makljpeg.st
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/maktjpeg.st b/clusterApp/3psw/jpegsr9c/jpeg-9c/maktjpeg.st
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/maktjpeg.st
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/maktjpeg.st
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/makvms.opt b/clusterApp/3psw/jpegsr9c/jpeg-9c/makvms.opt
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/makvms.opt
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/makvms.opt
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/missing b/clusterApp/3psw/jpegsr9c/jpeg-9c/missing
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/missing
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/missing
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdbmp.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/rdbmp.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdbmp.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/rdbmp.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdcolmap.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/rdcolmap.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdcolmap.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/rdcolmap.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdgif.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/rdgif.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdgif.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/rdgif.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdjpgcom.1 b/clusterApp/3psw/jpegsr9c/jpeg-9c/rdjpgcom.1
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdjpgcom.1
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/rdjpgcom.1
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdjpgcom.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/rdjpgcom.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdjpgcom.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/rdjpgcom.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdjpgcom.exe b/clusterApp/3psw/jpegsr9c/jpeg-9c/rdjpgcom.exe
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdjpgcom.exe
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/rdjpgcom.exe
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdppm.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/rdppm.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdppm.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/rdppm.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdrle.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/rdrle.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdrle.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/rdrle.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdswitch.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/rdswitch.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdswitch.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/rdswitch.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdtarga.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/rdtarga.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdtarga.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/rdtarga.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/readme.dos b/clusterApp/3psw/jpegsr9c/jpeg-9c/readme.dos
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/readme.dos
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/readme.dos
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/structure.txt b/clusterApp/3psw/jpegsr9c/jpeg-9c/structure.txt
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/structure.txt
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/structure.txt
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/testimg.bmp b/clusterApp/3psw/jpegsr9c/jpeg-9c/testimg.bmp
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/testimg.bmp
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/testimg.bmp
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/testimg.jpg b/clusterApp/3psw/jpegsr9c/jpeg-9c/testimg.jpg
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/testimg.jpg
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/testimg.jpg
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/testimg.ppm b/clusterApp/3psw/jpegsr9c/jpeg-9c/testimg.ppm
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/testimg.ppm
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/testimg.ppm
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/testimgp.jpg b/clusterApp/3psw/jpegsr9c/jpeg-9c/testimgp.jpg
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/testimgp.jpg
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/testimgp.jpg
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/testorig.jpg b/clusterApp/3psw/jpegsr9c/jpeg-9c/testorig.jpg
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/testorig.jpg
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/testorig.jpg
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/testprog.jpg b/clusterApp/3psw/jpegsr9c/jpeg-9c/testprog.jpg
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/testprog.jpg
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/testprog.jpg
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/transupp.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/transupp.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/transupp.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/transupp.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/transupp.h b/clusterApp/3psw/jpegsr9c/jpeg-9c/transupp.h
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/transupp.h
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/transupp.h
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/usage.txt b/clusterApp/3psw/jpegsr9c/jpeg-9c/usage.txt
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/usage.txt
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/usage.txt
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/wizard.txt b/clusterApp/3psw/jpegsr9c/jpeg-9c/wizard.txt
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/wizard.txt
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/wizard.txt
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/wrbmp.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/wrbmp.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/wrbmp.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/wrbmp.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/wrgif.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/wrgif.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/wrgif.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/wrgif.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/wrjpgcom.1 b/clusterApp/3psw/jpegsr9c/jpeg-9c/wrjpgcom.1
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/wrjpgcom.1
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/wrjpgcom.1
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/wrjpgcom.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/wrjpgcom.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/wrjpgcom.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/wrjpgcom.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/wrjpgcom.exe b/clusterApp/3psw/jpegsr9c/jpeg-9c/wrjpgcom.exe
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/wrjpgcom.exe
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/wrjpgcom.exe
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/wrppm.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/wrppm.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/wrppm.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/wrppm.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/wrrle.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/wrrle.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/wrrle.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/wrrle.c
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/wrtarga.c b/clusterApp/3psw/jpegsr9c/jpeg-9c/wrtarga.c
similarity index 100%
rename from insDavi2.0/3psw/jpegsr9c/jpeg-9c/wrtarga.c
rename to clusterApp/3psw/jpegsr9c/jpeg-9c/wrtarga.c
diff --git a/insDavi2.0/3psw/lpng1634/ANNOUNCE b/clusterApp/3psw/lpng1634/ANNOUNCE
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/ANNOUNCE
rename to clusterApp/3psw/lpng1634/ANNOUNCE
diff --git a/insDavi2.0/3psw/lpng1634/CHANGES b/clusterApp/3psw/lpng1634/CHANGES
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/CHANGES
rename to clusterApp/3psw/lpng1634/CHANGES
diff --git a/insDavi2.0/3psw/lpng1634/CMakeLists.txt b/clusterApp/3psw/lpng1634/CMakeLists.txt
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/CMakeLists.txt
rename to clusterApp/3psw/lpng1634/CMakeLists.txt
diff --git a/insDavi2.0/3psw/lpng1634/INSTALL b/clusterApp/3psw/lpng1634/INSTALL
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/INSTALL
rename to clusterApp/3psw/lpng1634/INSTALL
diff --git a/insDavi2.0/3psw/lpng1634/LICENSE b/clusterApp/3psw/lpng1634/LICENSE
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/LICENSE
rename to clusterApp/3psw/lpng1634/LICENSE
diff --git a/insDavi2.0/3psw/lpng1634/README b/clusterApp/3psw/lpng1634/README
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/README
rename to clusterApp/3psw/lpng1634/README
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeCache.txt b/clusterApp/3psw/lpng1634/build_win/CMakeCache.txt
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeCache.txt
rename to clusterApp/3psw/lpng1634/build_win/CMakeCache.txt
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/3.10.2/CMakeASMCompiler.cmake b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/3.10.2/CMakeASMCompiler.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/3.10.2/CMakeASMCompiler.cmake
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/3.10.2/CMakeASMCompiler.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/3.10.2/CMakeCCompiler.cmake b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/3.10.2/CMakeCCompiler.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/3.10.2/CMakeCCompiler.cmake
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/3.10.2/CMakeCCompiler.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/3.10.2/CMakeDetermineCompilerABI_C.bin b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/3.10.2/CMakeDetermineCompilerABI_C.bin
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/3.10.2/CMakeDetermineCompilerABI_C.bin
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/3.10.2/CMakeDetermineCompilerABI_C.bin
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/3.10.2/CMakeRCCompiler.cmake b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/3.10.2/CMakeRCCompiler.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/3.10.2/CMakeRCCompiler.cmake
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/3.10.2/CMakeRCCompiler.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/3.10.2/CMakeSystem.cmake b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/3.10.2/CMakeSystem.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/3.10.2/CMakeSystem.cmake
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/3.10.2/CMakeSystem.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/3.10.2/CompilerIdC/CMakeCCompilerId.c b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/3.10.2/CompilerIdC/CMakeCCompilerId.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/3.10.2/CompilerIdC/CMakeCCompilerId.c
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/3.10.2/CompilerIdC/CMakeCCompilerId.c
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/3.10.2/CompilerIdC/a.exe b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/3.10.2/CompilerIdC/a.exe
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/3.10.2/CompilerIdC/a.exe
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/3.10.2/CompilerIdC/a.exe
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/CMakeDirectoryInformation.cmake b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/CMakeDirectoryInformation.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/CMakeDirectoryInformation.cmake
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/CMakeDirectoryInformation.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/CMakeError.log b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/CMakeError.log
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/CMakeError.log
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/CMakeError.log
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/CMakeOutput.log b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/CMakeOutput.log
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/CMakeOutput.log
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/CMakeOutput.log
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/Export/lib/libpng/libpng16-release.cmake b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/Export/lib/libpng/libpng16-release.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/Export/lib/libpng/libpng16-release.cmake
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/Export/lib/libpng/libpng16-release.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/Export/lib/libpng/libpng16.cmake b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/Export/lib/libpng/libpng16.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/Export/lib/libpng/libpng16.cmake
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/Export/lib/libpng/libpng16.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/Makefile.cmake b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/Makefile.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/Makefile.cmake
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/Makefile.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/Makefile2 b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/Makefile2
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/Makefile2
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/Makefile2
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/TargetDirectories.txt b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/TargetDirectories.txt
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/TargetDirectories.txt
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/TargetDirectories.txt
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/cmake.check_cache b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/cmake.check_cache
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/cmake.check_cache
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/cmake.check_cache
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/feature_tests.bin b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/feature_tests.bin
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/feature_tests.bin
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/feature_tests.bin
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/feature_tests.c b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/feature_tests.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/feature_tests.c
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/feature_tests.c
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/genfiles.dir/DependInfo.cmake b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/genfiles.dir/DependInfo.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/genfiles.dir/DependInfo.cmake
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/genfiles.dir/DependInfo.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/genfiles.dir/build.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/genfiles.dir/build.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/genfiles.dir/build.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/genfiles.dir/build.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/genfiles.dir/cmake_clean.cmake b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/genfiles.dir/cmake_clean.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/genfiles.dir/cmake_clean.cmake
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/genfiles.dir/cmake_clean.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/genfiles.dir/depend.internal b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/genfiles.dir/depend.internal
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/genfiles.dir/depend.internal
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/genfiles.dir/depend.internal
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/genfiles.dir/depend.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/genfiles.dir/depend.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/genfiles.dir/depend.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/genfiles.dir/depend.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/genfiles.dir/progress.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/genfiles.dir/progress.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/genfiles.dir/progress.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/genfiles.dir/progress.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/C.includecache b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/C.includecache
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/C.includecache
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/C.includecache
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/DependInfo.cmake b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/DependInfo.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/DependInfo.cmake
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/DependInfo.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/build.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/build.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/build.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/build.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/cmake_clean.cmake b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/cmake_clean.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/cmake_clean.cmake
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/cmake_clean.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/contrib/tools/png-fix-itxt.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/contrib/tools/png-fix-itxt.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/contrib/tools/png-fix-itxt.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/contrib/tools/png-fix-itxt.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/depend.internal b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/depend.internal
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/depend.internal
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/depend.internal
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/depend.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/depend.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/depend.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/depend.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/flags.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/flags.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/flags.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/flags.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/includes_C.rsp b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/includes_C.rsp
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/includes_C.rsp
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/includes_C.rsp
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/link.txt b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/link.txt
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/link.txt
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/link.txt
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/linklibs.rsp b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/linklibs.rsp
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/linklibs.rsp
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/linklibs.rsp
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/objects.a b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/objects.a
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/objects.a
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/objects.a
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/objects1.rsp b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/objects1.rsp
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/objects1.rsp
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/objects1.rsp
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/progress.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/progress.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/progress.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png-fix-itxt.dir/progress.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/C.includecache b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/C.includecache
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/C.includecache
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/C.includecache
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/DependInfo.cmake b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/DependInfo.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/DependInfo.cmake
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/DependInfo.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/build.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/build.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/build.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/build.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/cmake_clean.cmake b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/cmake_clean.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/cmake_clean.cmake
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/cmake_clean.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/depend.internal b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/depend.internal
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/depend.internal
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/depend.internal
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/depend.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/depend.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/depend.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/depend.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/flags.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/flags.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/flags.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/flags.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/includes_C.rsp b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/includes_C.rsp
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/includes_C.rsp
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/includes_C.rsp
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/link.txt b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/link.txt
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/link.txt
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/link.txt
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/linklibs.rsp b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/linklibs.rsp
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/linklibs.rsp
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/linklibs.rsp
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/objects.a b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/objects.a
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/objects.a
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/objects.a
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/objects1.rsp b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/objects1.rsp
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/objects1.rsp
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/objects1.rsp
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/png.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/png.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/png.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/png.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngerror.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngerror.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngerror.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngerror.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngget.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngget.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngget.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngget.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngmem.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngmem.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngmem.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngmem.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngpread.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngpread.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngpread.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngpread.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngread.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngread.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngread.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngread.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngrio.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngrio.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngrio.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngrio.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngrtran.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngrtran.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngrtran.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngrtran.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngrutil.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngrutil.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngrutil.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngrutil.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngset.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngset.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngset.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngset.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngtrans.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngtrans.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngtrans.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngtrans.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngwio.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngwio.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngwio.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngwio.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngwrite.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngwrite.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngwrite.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngwrite.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngwtran.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngwtran.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngwtran.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngwtran.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngwutil.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngwutil.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngwutil.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/pngwutil.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/progress.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/progress.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png.dir/progress.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png.dir/progress.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/C.includecache b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/C.includecache
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/C.includecache
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/C.includecache
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/DependInfo.cmake b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/DependInfo.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/DependInfo.cmake
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/DependInfo.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/build.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/build.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/build.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/build.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/cmake_clean.cmake b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/cmake_clean.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/cmake_clean.cmake
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/cmake_clean.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/cmake_clean_target.cmake b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/cmake_clean_target.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/cmake_clean_target.cmake
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/cmake_clean_target.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/depend.internal b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/depend.internal
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/depend.internal
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/depend.internal
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/depend.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/depend.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/depend.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/depend.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/flags.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/flags.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/flags.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/flags.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/includes_C.rsp b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/includes_C.rsp
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/includes_C.rsp
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/includes_C.rsp
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/link.txt b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/link.txt
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/link.txt
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/link.txt
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/png.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/png.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/png.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/png.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngerror.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngerror.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngerror.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngerror.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngget.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngget.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngget.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngget.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngmem.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngmem.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngmem.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngmem.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngpread.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngpread.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngpread.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngpread.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngread.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngread.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngread.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngread.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngrio.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngrio.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngrio.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngrio.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngrtran.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngrtran.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngrtran.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngrtran.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngrutil.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngrutil.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngrutil.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngrutil.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngset.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngset.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngset.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngset.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngtrans.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngtrans.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngtrans.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngtrans.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngwio.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngwio.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngwio.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngwio.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngwrite.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngwrite.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngwrite.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngwrite.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngwtran.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngwtran.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngwtran.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngwtran.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngwutil.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngwutil.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngwutil.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/pngwutil.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/progress.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/progress.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/progress.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/png_static.dir/progress.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/C.includecache b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/C.includecache
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/C.includecache
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/C.includecache
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/DependInfo.cmake b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/DependInfo.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/DependInfo.cmake
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/DependInfo.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/build.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/build.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/build.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/build.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/cmake_clean.cmake b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/cmake_clean.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/cmake_clean.cmake
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/cmake_clean.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/contrib/tools/pngfix.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/contrib/tools/pngfix.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/contrib/tools/pngfix.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/contrib/tools/pngfix.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/depend.internal b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/depend.internal
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/depend.internal
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/depend.internal
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/depend.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/depend.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/depend.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/depend.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/flags.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/flags.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/flags.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/flags.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/includes_C.rsp b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/includes_C.rsp
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/includes_C.rsp
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/includes_C.rsp
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/link.txt b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/link.txt
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/link.txt
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/link.txt
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/linklibs.rsp b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/linklibs.rsp
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/linklibs.rsp
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/linklibs.rsp
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/objects.a b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/objects.a
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/objects.a
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/objects.a
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/objects1.rsp b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/objects1.rsp
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/objects1.rsp
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/objects1.rsp
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/progress.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/progress.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/progress.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngfix.dir/progress.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/C.includecache b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/C.includecache
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/C.includecache
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/C.includecache
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/DependInfo.cmake b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/DependInfo.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/DependInfo.cmake
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/DependInfo.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/build.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/build.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/build.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/build.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/cmake_clean.cmake b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/cmake_clean.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/cmake_clean.cmake
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/cmake_clean.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/contrib/libtests/pngimage.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/contrib/libtests/pngimage.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/contrib/libtests/pngimage.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/contrib/libtests/pngimage.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/depend.internal b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/depend.internal
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/depend.internal
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/depend.internal
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/depend.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/depend.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/depend.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/depend.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/flags.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/flags.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/flags.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/flags.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/includes_C.rsp b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/includes_C.rsp
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/includes_C.rsp
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/includes_C.rsp
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/link.txt b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/link.txt
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/link.txt
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/link.txt
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/linklibs.rsp b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/linklibs.rsp
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/linklibs.rsp
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/linklibs.rsp
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/objects.a b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/objects.a
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/objects.a
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/objects.a
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/objects1.rsp b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/objects1.rsp
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/objects1.rsp
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/objects1.rsp
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/progress.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/progress.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/progress.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngimage.dir/progress.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/C.includecache b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/C.includecache
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/C.includecache
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/C.includecache
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/DependInfo.cmake b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/DependInfo.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/DependInfo.cmake
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/DependInfo.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/build.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/build.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/build.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/build.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/cmake_clean.cmake b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/cmake_clean.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/cmake_clean.cmake
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/cmake_clean.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/contrib/libtests/pngstest.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/contrib/libtests/pngstest.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/contrib/libtests/pngstest.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/contrib/libtests/pngstest.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/depend.internal b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/depend.internal
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/depend.internal
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/depend.internal
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/depend.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/depend.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/depend.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/depend.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/flags.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/flags.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/flags.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/flags.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/includes_C.rsp b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/includes_C.rsp
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/includes_C.rsp
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/includes_C.rsp
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/link.txt b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/link.txt
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/link.txt
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/link.txt
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/linklibs.rsp b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/linklibs.rsp
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/linklibs.rsp
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/linklibs.rsp
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/objects.a b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/objects.a
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/objects.a
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/objects.a
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/objects1.rsp b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/objects1.rsp
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/objects1.rsp
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/objects1.rsp
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/progress.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/progress.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/progress.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngstest.dir/progress.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/C.includecache b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/C.includecache
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/C.includecache
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/C.includecache
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/DependInfo.cmake b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/DependInfo.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/DependInfo.cmake
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/DependInfo.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/build.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/build.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/build.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/build.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/cmake_clean.cmake b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/cmake_clean.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/cmake_clean.cmake
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/cmake_clean.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/depend.internal b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/depend.internal
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/depend.internal
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/depend.internal
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/depend.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/depend.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/depend.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/depend.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/flags.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/flags.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/flags.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/flags.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/includes_C.rsp b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/includes_C.rsp
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/includes_C.rsp
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/includes_C.rsp
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/link.txt b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/link.txt
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/link.txt
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/link.txt
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/linklibs.rsp b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/linklibs.rsp
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/linklibs.rsp
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/linklibs.rsp
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/objects.a b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/objects.a
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/objects.a
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/objects.a
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/objects1.rsp b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/objects1.rsp
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/objects1.rsp
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/objects1.rsp
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/pngtest.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/pngtest.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/pngtest.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/pngtest.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/progress.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/progress.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/progress.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngtest.dir/progress.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/C.includecache b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/C.includecache
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/C.includecache
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/C.includecache
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/DependInfo.cmake b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/DependInfo.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/DependInfo.cmake
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/DependInfo.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/build.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/build.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/build.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/build.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/cmake_clean.cmake b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/cmake_clean.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/cmake_clean.cmake
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/cmake_clean.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/contrib/libtests/pngunknown.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/contrib/libtests/pngunknown.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/contrib/libtests/pngunknown.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/contrib/libtests/pngunknown.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/depend.internal b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/depend.internal
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/depend.internal
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/depend.internal
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/depend.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/depend.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/depend.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/depend.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/flags.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/flags.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/flags.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/flags.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/includes_C.rsp b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/includes_C.rsp
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/includes_C.rsp
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/includes_C.rsp
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/link.txt b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/link.txt
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/link.txt
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/link.txt
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/linklibs.rsp b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/linklibs.rsp
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/linklibs.rsp
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/linklibs.rsp
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/objects.a b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/objects.a
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/objects.a
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/objects.a
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/objects1.rsp b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/objects1.rsp
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/objects1.rsp
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/objects1.rsp
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/progress.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/progress.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/progress.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngunknown.dir/progress.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/C.includecache b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/C.includecache
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/C.includecache
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/C.includecache
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/DependInfo.cmake b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/DependInfo.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/DependInfo.cmake
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/DependInfo.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/build.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/build.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/build.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/build.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/cmake_clean.cmake b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/cmake_clean.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/cmake_clean.cmake
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/cmake_clean.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/contrib/libtests/pngvalid.c.obj b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/contrib/libtests/pngvalid.c.obj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/contrib/libtests/pngvalid.c.obj
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/contrib/libtests/pngvalid.c.obj
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/depend.internal b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/depend.internal
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/depend.internal
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/depend.internal
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/depend.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/depend.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/depend.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/depend.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/flags.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/flags.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/flags.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/flags.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/includes_C.rsp b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/includes_C.rsp
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/includes_C.rsp
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/includes_C.rsp
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/link.txt b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/link.txt
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/link.txt
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/link.txt
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/linklibs.rsp b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/linklibs.rsp
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/linklibs.rsp
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/linklibs.rsp
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/objects.a b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/objects.a
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/objects.a
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/objects.a
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/objects1.rsp b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/objects1.rsp
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/objects1.rsp
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/objects1.rsp
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/progress.make b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/progress.make
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/progress.make
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/pngvalid.dir/progress.make
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/progress.marks b/clusterApp/3psw/lpng1634/build_win/CMakeFiles/progress.marks
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CMakeFiles/progress.marks
rename to clusterApp/3psw/lpng1634/build_win/CMakeFiles/progress.marks
diff --git a/insDavi2.0/3psw/lpng1634/build_win/CTestTestfile.cmake b/clusterApp/3psw/lpng1634/build_win/CTestTestfile.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/CTestTestfile.cmake
rename to clusterApp/3psw/lpng1634/build_win/CTestTestfile.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/Makefile b/clusterApp/3psw/lpng1634/build_win/Makefile
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/Makefile
rename to clusterApp/3psw/lpng1634/build_win/Makefile
diff --git a/insDavi2.0/3psw/lpng1634/build_win/cmake_install.cmake b/clusterApp/3psw/lpng1634/build_win/cmake_install.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/cmake_install.cmake
rename to clusterApp/3psw/lpng1634/build_win/cmake_install.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/libpng-config b/clusterApp/3psw/lpng1634/build_win/libpng-config
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/libpng-config
rename to clusterApp/3psw/lpng1634/build_win/libpng-config
diff --git a/insDavi2.0/3psw/lpng1634/build_win/libpng.a b/clusterApp/3psw/lpng1634/build_win/libpng.a
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/libpng.a
rename to clusterApp/3psw/lpng1634/build_win/libpng.a
diff --git a/insDavi2.0/3psw/lpng1634/build_win/libpng.cbp b/clusterApp/3psw/lpng1634/build_win/libpng.cbp
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/libpng.cbp
rename to clusterApp/3psw/lpng1634/build_win/libpng.cbp
diff --git a/insDavi2.0/3psw/lpng1634/build_win/libpng.dll.a b/clusterApp/3psw/lpng1634/build_win/libpng.dll.a
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/libpng.dll.a
rename to clusterApp/3psw/lpng1634/build_win/libpng.dll.a
diff --git a/insDavi2.0/3psw/lpng1634/build_win/libpng.layout b/clusterApp/3psw/lpng1634/build_win/libpng.layout
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/libpng.layout
rename to clusterApp/3psw/lpng1634/build_win/libpng.layout
diff --git a/insDavi2.0/3psw/lpng1634/build_win/libpng.pc b/clusterApp/3psw/lpng1634/build_win/libpng.pc
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/libpng.pc
rename to clusterApp/3psw/lpng1634/build_win/libpng.pc
diff --git a/insDavi2.0/3psw/lpng1634/build_win/libpng16-config b/clusterApp/3psw/lpng1634/build_win/libpng16-config
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/libpng16-config
rename to clusterApp/3psw/lpng1634/build_win/libpng16-config
diff --git a/insDavi2.0/3psw/lpng1634/build_win/libpng16.a b/clusterApp/3psw/lpng1634/build_win/libpng16.a
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/libpng16.a
rename to clusterApp/3psw/lpng1634/build_win/libpng16.a
diff --git a/insDavi2.0/3psw/lpng1634/build_win/libpng16.dll b/clusterApp/3psw/lpng1634/build_win/libpng16.dll
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/libpng16.dll
rename to clusterApp/3psw/lpng1634/build_win/libpng16.dll
diff --git a/insDavi2.0/3psw/lpng1634/build_win/libpng16.dll.a b/clusterApp/3psw/lpng1634/build_win/libpng16.dll.a
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/libpng16.dll.a
rename to clusterApp/3psw/lpng1634/build_win/libpng16.dll.a
diff --git a/insDavi2.0/3psw/lpng1634/build_win/libpng16.pc b/clusterApp/3psw/lpng1634/build_win/libpng16.pc
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/libpng16.pc
rename to clusterApp/3psw/lpng1634/build_win/libpng16.pc
diff --git a/insDavi2.0/3psw/lpng1634/build_win/png-fix-itxt.exe b/clusterApp/3psw/lpng1634/build_win/png-fix-itxt.exe
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/png-fix-itxt.exe
rename to clusterApp/3psw/lpng1634/build_win/png-fix-itxt.exe
diff --git a/insDavi2.0/3psw/lpng1634/build_win/pngfix.exe b/clusterApp/3psw/lpng1634/build_win/pngfix.exe
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/pngfix.exe
rename to clusterApp/3psw/lpng1634/build_win/pngfix.exe
diff --git a/insDavi2.0/3psw/lpng1634/build_win/pngimage.exe b/clusterApp/3psw/lpng1634/build_win/pngimage.exe
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/pngimage.exe
rename to clusterApp/3psw/lpng1634/build_win/pngimage.exe
diff --git a/insDavi2.0/3psw/lpng1634/build_win/pnglibconf.h b/clusterApp/3psw/lpng1634/build_win/pnglibconf.h
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/pnglibconf.h
rename to clusterApp/3psw/lpng1634/build_win/pnglibconf.h
diff --git a/insDavi2.0/3psw/lpng1634/build_win/pngstest.exe b/clusterApp/3psw/lpng1634/build_win/pngstest.exe
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/pngstest.exe
rename to clusterApp/3psw/lpng1634/build_win/pngstest.exe
diff --git a/insDavi2.0/3psw/lpng1634/build_win/pngtest.exe b/clusterApp/3psw/lpng1634/build_win/pngtest.exe
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/pngtest.exe
rename to clusterApp/3psw/lpng1634/build_win/pngtest.exe
diff --git a/insDavi2.0/3psw/lpng1634/build_win/pngunknown.exe b/clusterApp/3psw/lpng1634/build_win/pngunknown.exe
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/pngunknown.exe
rename to clusterApp/3psw/lpng1634/build_win/pngunknown.exe
diff --git a/insDavi2.0/3psw/lpng1634/build_win/pngvalid.exe b/clusterApp/3psw/lpng1634/build_win/pngvalid.exe
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/pngvalid.exe
rename to clusterApp/3psw/lpng1634/build_win/pngvalid.exe
diff --git a/insDavi2.0/3psw/lpng1634/build_win/scripts/genchk.cmake b/clusterApp/3psw/lpng1634/build_win/scripts/genchk.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/scripts/genchk.cmake
rename to clusterApp/3psw/lpng1634/build_win/scripts/genchk.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/scripts/genout.cmake b/clusterApp/3psw/lpng1634/build_win/scripts/genout.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/scripts/genout.cmake
rename to clusterApp/3psw/lpng1634/build_win/scripts/genout.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/scripts/gensrc.cmake b/clusterApp/3psw/lpng1634/build_win/scripts/gensrc.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/scripts/gensrc.cmake
rename to clusterApp/3psw/lpng1634/build_win/scripts/gensrc.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/tests/pngimage-full.cmake b/clusterApp/3psw/lpng1634/build_win/tests/pngimage-full.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/tests/pngimage-full.cmake
rename to clusterApp/3psw/lpng1634/build_win/tests/pngimage-full.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/tests/pngimage-quick.cmake b/clusterApp/3psw/lpng1634/build_win/tests/pngimage-quick.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/tests/pngimage-quick.cmake
rename to clusterApp/3psw/lpng1634/build_win/tests/pngimage-quick.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/tests/pngstest-1.8-alpha.cmake b/clusterApp/3psw/lpng1634/build_win/tests/pngstest-1.8-alpha.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/tests/pngstest-1.8-alpha.cmake
rename to clusterApp/3psw/lpng1634/build_win/tests/pngstest-1.8-alpha.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/tests/pngstest-1.8-none.cmake b/clusterApp/3psw/lpng1634/build_win/tests/pngstest-1.8-none.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/tests/pngstest-1.8-none.cmake
rename to clusterApp/3psw/lpng1634/build_win/tests/pngstest-1.8-none.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/tests/pngstest-linear-alpha.cmake b/clusterApp/3psw/lpng1634/build_win/tests/pngstest-linear-alpha.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/tests/pngstest-linear-alpha.cmake
rename to clusterApp/3psw/lpng1634/build_win/tests/pngstest-linear-alpha.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/tests/pngstest-linear-none.cmake b/clusterApp/3psw/lpng1634/build_win/tests/pngstest-linear-none.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/tests/pngstest-linear-none.cmake
rename to clusterApp/3psw/lpng1634/build_win/tests/pngstest-linear-none.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/tests/pngstest-none-alpha.cmake b/clusterApp/3psw/lpng1634/build_win/tests/pngstest-none-alpha.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/tests/pngstest-none-alpha.cmake
rename to clusterApp/3psw/lpng1634/build_win/tests/pngstest-none-alpha.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/tests/pngstest-none-none.cmake b/clusterApp/3psw/lpng1634/build_win/tests/pngstest-none-none.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/tests/pngstest-none-none.cmake
rename to clusterApp/3psw/lpng1634/build_win/tests/pngstest-none-none.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/tests/pngstest-sRGB-alpha.cmake b/clusterApp/3psw/lpng1634/build_win/tests/pngstest-sRGB-alpha.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/tests/pngstest-sRGB-alpha.cmake
rename to clusterApp/3psw/lpng1634/build_win/tests/pngstest-sRGB-alpha.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/tests/pngstest-sRGB-none.cmake b/clusterApp/3psw/lpng1634/build_win/tests/pngstest-sRGB-none.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/tests/pngstest-sRGB-none.cmake
rename to clusterApp/3psw/lpng1634/build_win/tests/pngstest-sRGB-none.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/tests/pngtest.cmake b/clusterApp/3psw/lpng1634/build_win/tests/pngtest.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/tests/pngtest.cmake
rename to clusterApp/3psw/lpng1634/build_win/tests/pngtest.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/tests/pngunknown-IDAT.cmake b/clusterApp/3psw/lpng1634/build_win/tests/pngunknown-IDAT.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/tests/pngunknown-IDAT.cmake
rename to clusterApp/3psw/lpng1634/build_win/tests/pngunknown-IDAT.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/tests/pngunknown-discard.cmake b/clusterApp/3psw/lpng1634/build_win/tests/pngunknown-discard.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/tests/pngunknown-discard.cmake
rename to clusterApp/3psw/lpng1634/build_win/tests/pngunknown-discard.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/tests/pngunknown-if-safe.cmake b/clusterApp/3psw/lpng1634/build_win/tests/pngunknown-if-safe.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/tests/pngunknown-if-safe.cmake
rename to clusterApp/3psw/lpng1634/build_win/tests/pngunknown-if-safe.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/tests/pngunknown-sAPI.cmake b/clusterApp/3psw/lpng1634/build_win/tests/pngunknown-sAPI.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/tests/pngunknown-sAPI.cmake
rename to clusterApp/3psw/lpng1634/build_win/tests/pngunknown-sAPI.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/tests/pngunknown-sTER.cmake b/clusterApp/3psw/lpng1634/build_win/tests/pngunknown-sTER.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/tests/pngunknown-sTER.cmake
rename to clusterApp/3psw/lpng1634/build_win/tests/pngunknown-sTER.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/tests/pngunknown-save.cmake b/clusterApp/3psw/lpng1634/build_win/tests/pngunknown-save.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/tests/pngunknown-save.cmake
rename to clusterApp/3psw/lpng1634/build_win/tests/pngunknown-save.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/tests/pngunknown-vpAg.cmake b/clusterApp/3psw/lpng1634/build_win/tests/pngunknown-vpAg.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/tests/pngunknown-vpAg.cmake
rename to clusterApp/3psw/lpng1634/build_win/tests/pngunknown-vpAg.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/tests/pngvalid-gamma-16-to-8.cmake b/clusterApp/3psw/lpng1634/build_win/tests/pngvalid-gamma-16-to-8.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/tests/pngvalid-gamma-16-to-8.cmake
rename to clusterApp/3psw/lpng1634/build_win/tests/pngvalid-gamma-16-to-8.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/tests/pngvalid-gamma-alpha-mode.cmake b/clusterApp/3psw/lpng1634/build_win/tests/pngvalid-gamma-alpha-mode.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/tests/pngvalid-gamma-alpha-mode.cmake
rename to clusterApp/3psw/lpng1634/build_win/tests/pngvalid-gamma-alpha-mode.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/tests/pngvalid-gamma-background.cmake b/clusterApp/3psw/lpng1634/build_win/tests/pngvalid-gamma-background.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/tests/pngvalid-gamma-background.cmake
rename to clusterApp/3psw/lpng1634/build_win/tests/pngvalid-gamma-background.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/tests/pngvalid-gamma-expand16-alpha-mode.cmake b/clusterApp/3psw/lpng1634/build_win/tests/pngvalid-gamma-expand16-alpha-mode.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/tests/pngvalid-gamma-expand16-alpha-mode.cmake
rename to clusterApp/3psw/lpng1634/build_win/tests/pngvalid-gamma-expand16-alpha-mode.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/tests/pngvalid-gamma-expand16-background.cmake b/clusterApp/3psw/lpng1634/build_win/tests/pngvalid-gamma-expand16-background.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/tests/pngvalid-gamma-expand16-background.cmake
rename to clusterApp/3psw/lpng1634/build_win/tests/pngvalid-gamma-expand16-background.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/tests/pngvalid-gamma-expand16-transform.cmake b/clusterApp/3psw/lpng1634/build_win/tests/pngvalid-gamma-expand16-transform.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/tests/pngvalid-gamma-expand16-transform.cmake
rename to clusterApp/3psw/lpng1634/build_win/tests/pngvalid-gamma-expand16-transform.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/tests/pngvalid-gamma-sbit.cmake b/clusterApp/3psw/lpng1634/build_win/tests/pngvalid-gamma-sbit.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/tests/pngvalid-gamma-sbit.cmake
rename to clusterApp/3psw/lpng1634/build_win/tests/pngvalid-gamma-sbit.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/tests/pngvalid-gamma-threshold.cmake b/clusterApp/3psw/lpng1634/build_win/tests/pngvalid-gamma-threshold.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/tests/pngvalid-gamma-threshold.cmake
rename to clusterApp/3psw/lpng1634/build_win/tests/pngvalid-gamma-threshold.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/tests/pngvalid-gamma-transform.cmake b/clusterApp/3psw/lpng1634/build_win/tests/pngvalid-gamma-transform.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/tests/pngvalid-gamma-transform.cmake
rename to clusterApp/3psw/lpng1634/build_win/tests/pngvalid-gamma-transform.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/tests/pngvalid-progressive-interlace-standard.cmake b/clusterApp/3psw/lpng1634/build_win/tests/pngvalid-progressive-interlace-standard.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/tests/pngvalid-progressive-interlace-standard.cmake
rename to clusterApp/3psw/lpng1634/build_win/tests/pngvalid-progressive-interlace-standard.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/tests/pngvalid-progressive-size.cmake b/clusterApp/3psw/lpng1634/build_win/tests/pngvalid-progressive-size.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/tests/pngvalid-progressive-size.cmake
rename to clusterApp/3psw/lpng1634/build_win/tests/pngvalid-progressive-size.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/tests/pngvalid-progressive-standard.cmake b/clusterApp/3psw/lpng1634/build_win/tests/pngvalid-progressive-standard.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/tests/pngvalid-progressive-standard.cmake
rename to clusterApp/3psw/lpng1634/build_win/tests/pngvalid-progressive-standard.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/tests/pngvalid-standard.cmake b/clusterApp/3psw/lpng1634/build_win/tests/pngvalid-standard.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/tests/pngvalid-standard.cmake
rename to clusterApp/3psw/lpng1634/build_win/tests/pngvalid-standard.cmake
diff --git a/insDavi2.0/3psw/lpng1634/build_win/tests/pngvalid-transform.cmake b/clusterApp/3psw/lpng1634/build_win/tests/pngvalid-transform.cmake
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/build_win/tests/pngvalid-transform.cmake
rename to clusterApp/3psw/lpng1634/build_win/tests/pngvalid-transform.cmake
diff --git a/insDavi2.0/3psw/lpng1634/configure b/clusterApp/3psw/lpng1634/configure
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/configure
rename to clusterApp/3psw/lpng1634/configure
diff --git a/insDavi2.0/3psw/lpng1634/contrib/README.txt b/clusterApp/3psw/lpng1634/contrib/README.txt
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/README.txt
rename to clusterApp/3psw/lpng1634/contrib/README.txt
diff --git a/insDavi2.0/3psw/lpng1634/contrib/arm-neon/README b/clusterApp/3psw/lpng1634/contrib/arm-neon/README
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/arm-neon/README
rename to clusterApp/3psw/lpng1634/contrib/arm-neon/README
diff --git a/insDavi2.0/3psw/lpng1634/contrib/arm-neon/android-ndk.c b/clusterApp/3psw/lpng1634/contrib/arm-neon/android-ndk.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/arm-neon/android-ndk.c
rename to clusterApp/3psw/lpng1634/contrib/arm-neon/android-ndk.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/arm-neon/linux-auxv.c b/clusterApp/3psw/lpng1634/contrib/arm-neon/linux-auxv.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/arm-neon/linux-auxv.c
rename to clusterApp/3psw/lpng1634/contrib/arm-neon/linux-auxv.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/arm-neon/linux.c b/clusterApp/3psw/lpng1634/contrib/arm-neon/linux.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/arm-neon/linux.c
rename to clusterApp/3psw/lpng1634/contrib/arm-neon/linux.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/examples/README.txt b/clusterApp/3psw/lpng1634/contrib/examples/README.txt
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/examples/README.txt
rename to clusterApp/3psw/lpng1634/contrib/examples/README.txt
diff --git a/insDavi2.0/3psw/lpng1634/contrib/examples/iccfrompng.c b/clusterApp/3psw/lpng1634/contrib/examples/iccfrompng.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/examples/iccfrompng.c
rename to clusterApp/3psw/lpng1634/contrib/examples/iccfrompng.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/examples/pngpixel.c b/clusterApp/3psw/lpng1634/contrib/examples/pngpixel.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/examples/pngpixel.c
rename to clusterApp/3psw/lpng1634/contrib/examples/pngpixel.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/examples/pngtopng.c b/clusterApp/3psw/lpng1634/contrib/examples/pngtopng.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/examples/pngtopng.c
rename to clusterApp/3psw/lpng1634/contrib/examples/pngtopng.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/examples/simpleover.c b/clusterApp/3psw/lpng1634/contrib/examples/simpleover.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/examples/simpleover.c
rename to clusterApp/3psw/lpng1634/contrib/examples/simpleover.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/gregbook/COPYING b/clusterApp/3psw/lpng1634/contrib/gregbook/COPYING
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/gregbook/COPYING
rename to clusterApp/3psw/lpng1634/contrib/gregbook/COPYING
diff --git a/insDavi2.0/3psw/lpng1634/contrib/gregbook/LICENSE b/clusterApp/3psw/lpng1634/contrib/gregbook/LICENSE
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/gregbook/LICENSE
rename to clusterApp/3psw/lpng1634/contrib/gregbook/LICENSE
diff --git a/insDavi2.0/3psw/lpng1634/contrib/gregbook/Makefile.mingw32 b/clusterApp/3psw/lpng1634/contrib/gregbook/Makefile.mingw32
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/gregbook/Makefile.mingw32
rename to clusterApp/3psw/lpng1634/contrib/gregbook/Makefile.mingw32
diff --git a/insDavi2.0/3psw/lpng1634/contrib/gregbook/Makefile.sgi b/clusterApp/3psw/lpng1634/contrib/gregbook/Makefile.sgi
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/gregbook/Makefile.sgi
rename to clusterApp/3psw/lpng1634/contrib/gregbook/Makefile.sgi
diff --git a/insDavi2.0/3psw/lpng1634/contrib/gregbook/Makefile.unx b/clusterApp/3psw/lpng1634/contrib/gregbook/Makefile.unx
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/gregbook/Makefile.unx
rename to clusterApp/3psw/lpng1634/contrib/gregbook/Makefile.unx
diff --git a/insDavi2.0/3psw/lpng1634/contrib/gregbook/Makefile.w32 b/clusterApp/3psw/lpng1634/contrib/gregbook/Makefile.w32
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/gregbook/Makefile.w32
rename to clusterApp/3psw/lpng1634/contrib/gregbook/Makefile.w32
diff --git a/insDavi2.0/3psw/lpng1634/contrib/gregbook/README b/clusterApp/3psw/lpng1634/contrib/gregbook/README
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/gregbook/README
rename to clusterApp/3psw/lpng1634/contrib/gregbook/README
diff --git a/insDavi2.0/3psw/lpng1634/contrib/gregbook/makevms.com b/clusterApp/3psw/lpng1634/contrib/gregbook/makevms.com
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/gregbook/makevms.com
rename to clusterApp/3psw/lpng1634/contrib/gregbook/makevms.com
diff --git a/insDavi2.0/3psw/lpng1634/contrib/gregbook/readpng.c b/clusterApp/3psw/lpng1634/contrib/gregbook/readpng.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/gregbook/readpng.c
rename to clusterApp/3psw/lpng1634/contrib/gregbook/readpng.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/gregbook/readpng.h b/clusterApp/3psw/lpng1634/contrib/gregbook/readpng.h
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/gregbook/readpng.h
rename to clusterApp/3psw/lpng1634/contrib/gregbook/readpng.h
diff --git a/insDavi2.0/3psw/lpng1634/contrib/gregbook/readpng2.c b/clusterApp/3psw/lpng1634/contrib/gregbook/readpng2.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/gregbook/readpng2.c
rename to clusterApp/3psw/lpng1634/contrib/gregbook/readpng2.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/gregbook/readpng2.h b/clusterApp/3psw/lpng1634/contrib/gregbook/readpng2.h
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/gregbook/readpng2.h
rename to clusterApp/3psw/lpng1634/contrib/gregbook/readpng2.h
diff --git a/insDavi2.0/3psw/lpng1634/contrib/gregbook/readppm.c b/clusterApp/3psw/lpng1634/contrib/gregbook/readppm.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/gregbook/readppm.c
rename to clusterApp/3psw/lpng1634/contrib/gregbook/readppm.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/gregbook/rpng-win.c b/clusterApp/3psw/lpng1634/contrib/gregbook/rpng-win.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/gregbook/rpng-win.c
rename to clusterApp/3psw/lpng1634/contrib/gregbook/rpng-win.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/gregbook/rpng-x.c b/clusterApp/3psw/lpng1634/contrib/gregbook/rpng-x.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/gregbook/rpng-x.c
rename to clusterApp/3psw/lpng1634/contrib/gregbook/rpng-x.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/gregbook/rpng2-win.c b/clusterApp/3psw/lpng1634/contrib/gregbook/rpng2-win.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/gregbook/rpng2-win.c
rename to clusterApp/3psw/lpng1634/contrib/gregbook/rpng2-win.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/gregbook/rpng2-x.c b/clusterApp/3psw/lpng1634/contrib/gregbook/rpng2-x.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/gregbook/rpng2-x.c
rename to clusterApp/3psw/lpng1634/contrib/gregbook/rpng2-x.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/gregbook/toucan.png b/clusterApp/3psw/lpng1634/contrib/gregbook/toucan.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/gregbook/toucan.png
rename to clusterApp/3psw/lpng1634/contrib/gregbook/toucan.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/gregbook/wpng.c b/clusterApp/3psw/lpng1634/contrib/gregbook/wpng.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/gregbook/wpng.c
rename to clusterApp/3psw/lpng1634/contrib/gregbook/wpng.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/gregbook/writepng.c b/clusterApp/3psw/lpng1634/contrib/gregbook/writepng.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/gregbook/writepng.c
rename to clusterApp/3psw/lpng1634/contrib/gregbook/writepng.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/gregbook/writepng.h b/clusterApp/3psw/lpng1634/contrib/gregbook/writepng.h
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/gregbook/writepng.h
rename to clusterApp/3psw/lpng1634/contrib/gregbook/writepng.h
diff --git a/insDavi2.0/3psw/lpng1634/contrib/libtests/fakepng.c b/clusterApp/3psw/lpng1634/contrib/libtests/fakepng.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/libtests/fakepng.c
rename to clusterApp/3psw/lpng1634/contrib/libtests/fakepng.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/libtests/gentests.sh b/clusterApp/3psw/lpng1634/contrib/libtests/gentests.sh
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/libtests/gentests.sh
rename to clusterApp/3psw/lpng1634/contrib/libtests/gentests.sh
diff --git a/insDavi2.0/3psw/lpng1634/contrib/libtests/makepng.c b/clusterApp/3psw/lpng1634/contrib/libtests/makepng.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/libtests/makepng.c
rename to clusterApp/3psw/lpng1634/contrib/libtests/makepng.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/libtests/pngimage.c b/clusterApp/3psw/lpng1634/contrib/libtests/pngimage.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/libtests/pngimage.c
rename to clusterApp/3psw/lpng1634/contrib/libtests/pngimage.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/libtests/pngstest-errors.h b/clusterApp/3psw/lpng1634/contrib/libtests/pngstest-errors.h
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/libtests/pngstest-errors.h
rename to clusterApp/3psw/lpng1634/contrib/libtests/pngstest-errors.h
diff --git a/insDavi2.0/3psw/lpng1634/contrib/libtests/pngstest.c b/clusterApp/3psw/lpng1634/contrib/libtests/pngstest.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/libtests/pngstest.c
rename to clusterApp/3psw/lpng1634/contrib/libtests/pngstest.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/libtests/pngunknown.c b/clusterApp/3psw/lpng1634/contrib/libtests/pngunknown.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/libtests/pngunknown.c
rename to clusterApp/3psw/lpng1634/contrib/libtests/pngunknown.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/libtests/pngvalid.c b/clusterApp/3psw/lpng1634/contrib/libtests/pngvalid.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/libtests/pngvalid.c
rename to clusterApp/3psw/lpng1634/contrib/libtests/pngvalid.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/libtests/readpng.c b/clusterApp/3psw/lpng1634/contrib/libtests/readpng.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/libtests/readpng.c
rename to clusterApp/3psw/lpng1634/contrib/libtests/readpng.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/libtests/tarith.c b/clusterApp/3psw/lpng1634/contrib/libtests/tarith.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/libtests/tarith.c
rename to clusterApp/3psw/lpng1634/contrib/libtests/tarith.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/libtests/timepng.c b/clusterApp/3psw/lpng1634/contrib/libtests/timepng.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/libtests/timepng.c
rename to clusterApp/3psw/lpng1634/contrib/libtests/timepng.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngminim/decoder/README b/clusterApp/3psw/lpng1634/contrib/pngminim/decoder/README
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngminim/decoder/README
rename to clusterApp/3psw/lpng1634/contrib/pngminim/decoder/README
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngminim/decoder/makefile b/clusterApp/3psw/lpng1634/contrib/pngminim/decoder/makefile
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngminim/decoder/makefile
rename to clusterApp/3psw/lpng1634/contrib/pngminim/decoder/makefile
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngminim/decoder/pngusr.dfa b/clusterApp/3psw/lpng1634/contrib/pngminim/decoder/pngusr.dfa
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngminim/decoder/pngusr.dfa
rename to clusterApp/3psw/lpng1634/contrib/pngminim/decoder/pngusr.dfa
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngminim/decoder/pngusr.h b/clusterApp/3psw/lpng1634/contrib/pngminim/decoder/pngusr.h
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngminim/decoder/pngusr.h
rename to clusterApp/3psw/lpng1634/contrib/pngminim/decoder/pngusr.h
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngminim/encoder/README b/clusterApp/3psw/lpng1634/contrib/pngminim/encoder/README
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngminim/encoder/README
rename to clusterApp/3psw/lpng1634/contrib/pngminim/encoder/README
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngminim/encoder/makefile b/clusterApp/3psw/lpng1634/contrib/pngminim/encoder/makefile
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngminim/encoder/makefile
rename to clusterApp/3psw/lpng1634/contrib/pngminim/encoder/makefile
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngminim/encoder/pngusr.dfa b/clusterApp/3psw/lpng1634/contrib/pngminim/encoder/pngusr.dfa
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngminim/encoder/pngusr.dfa
rename to clusterApp/3psw/lpng1634/contrib/pngminim/encoder/pngusr.dfa
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngminim/encoder/pngusr.h b/clusterApp/3psw/lpng1634/contrib/pngminim/encoder/pngusr.h
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngminim/encoder/pngusr.h
rename to clusterApp/3psw/lpng1634/contrib/pngminim/encoder/pngusr.h
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngminim/preader/README b/clusterApp/3psw/lpng1634/contrib/pngminim/preader/README
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngminim/preader/README
rename to clusterApp/3psw/lpng1634/contrib/pngminim/preader/README
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngminim/preader/makefile b/clusterApp/3psw/lpng1634/contrib/pngminim/preader/makefile
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngminim/preader/makefile
rename to clusterApp/3psw/lpng1634/contrib/pngminim/preader/makefile
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngminim/preader/pngusr.dfa b/clusterApp/3psw/lpng1634/contrib/pngminim/preader/pngusr.dfa
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngminim/preader/pngusr.dfa
rename to clusterApp/3psw/lpng1634/contrib/pngminim/preader/pngusr.dfa
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngminim/preader/pngusr.h b/clusterApp/3psw/lpng1634/contrib/pngminim/preader/pngusr.h
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngminim/preader/pngusr.h
rename to clusterApp/3psw/lpng1634/contrib/pngminim/preader/pngusr.h
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngminus/README b/clusterApp/3psw/lpng1634/contrib/pngminus/README
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngminus/README
rename to clusterApp/3psw/lpng1634/contrib/pngminus/README
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngminus/makefile.std b/clusterApp/3psw/lpng1634/contrib/pngminus/makefile.std
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngminus/makefile.std
rename to clusterApp/3psw/lpng1634/contrib/pngminus/makefile.std
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngminus/makefile.tc3 b/clusterApp/3psw/lpng1634/contrib/pngminus/makefile.tc3
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngminus/makefile.tc3
rename to clusterApp/3psw/lpng1634/contrib/pngminus/makefile.tc3
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngminus/makevms.com b/clusterApp/3psw/lpng1634/contrib/pngminus/makevms.com
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngminus/makevms.com
rename to clusterApp/3psw/lpng1634/contrib/pngminus/makevms.com
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngminus/png2pnm.bat b/clusterApp/3psw/lpng1634/contrib/pngminus/png2pnm.bat
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngminus/png2pnm.bat
rename to clusterApp/3psw/lpng1634/contrib/pngminus/png2pnm.bat
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngminus/png2pnm.c b/clusterApp/3psw/lpng1634/contrib/pngminus/png2pnm.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngminus/png2pnm.c
rename to clusterApp/3psw/lpng1634/contrib/pngminus/png2pnm.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngminus/png2pnm.sh b/clusterApp/3psw/lpng1634/contrib/pngminus/png2pnm.sh
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngminus/png2pnm.sh
rename to clusterApp/3psw/lpng1634/contrib/pngminus/png2pnm.sh
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngminus/pngminus.bat b/clusterApp/3psw/lpng1634/contrib/pngminus/pngminus.bat
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngminus/pngminus.bat
rename to clusterApp/3psw/lpng1634/contrib/pngminus/pngminus.bat
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngminus/pngminus.sh b/clusterApp/3psw/lpng1634/contrib/pngminus/pngminus.sh
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngminus/pngminus.sh
rename to clusterApp/3psw/lpng1634/contrib/pngminus/pngminus.sh
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngminus/pnm2png.bat b/clusterApp/3psw/lpng1634/contrib/pngminus/pnm2png.bat
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngminus/pnm2png.bat
rename to clusterApp/3psw/lpng1634/contrib/pngminus/pnm2png.bat
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngminus/pnm2png.c b/clusterApp/3psw/lpng1634/contrib/pngminus/pnm2png.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngminus/pnm2png.c
rename to clusterApp/3psw/lpng1634/contrib/pngminus/pnm2png.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngminus/pnm2png.sh b/clusterApp/3psw/lpng1634/contrib/pngminus/pnm2png.sh
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngminus/pnm2png.sh
rename to clusterApp/3psw/lpng1634/contrib/pngminus/pnm2png.sh
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngsuite/basn0g01.png b/clusterApp/3psw/lpng1634/contrib/pngsuite/basn0g01.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngsuite/basn0g01.png
rename to clusterApp/3psw/lpng1634/contrib/pngsuite/basn0g01.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngsuite/basn0g02.png b/clusterApp/3psw/lpng1634/contrib/pngsuite/basn0g02.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngsuite/basn0g02.png
rename to clusterApp/3psw/lpng1634/contrib/pngsuite/basn0g02.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngsuite/basn0g04.png b/clusterApp/3psw/lpng1634/contrib/pngsuite/basn0g04.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngsuite/basn0g04.png
rename to clusterApp/3psw/lpng1634/contrib/pngsuite/basn0g04.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngsuite/basn0g08.png b/clusterApp/3psw/lpng1634/contrib/pngsuite/basn0g08.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngsuite/basn0g08.png
rename to clusterApp/3psw/lpng1634/contrib/pngsuite/basn0g08.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngsuite/basn0g16.png b/clusterApp/3psw/lpng1634/contrib/pngsuite/basn0g16.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngsuite/basn0g16.png
rename to clusterApp/3psw/lpng1634/contrib/pngsuite/basn0g16.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngsuite/basn2c08.png b/clusterApp/3psw/lpng1634/contrib/pngsuite/basn2c08.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngsuite/basn2c08.png
rename to clusterApp/3psw/lpng1634/contrib/pngsuite/basn2c08.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngsuite/basn2c16.png b/clusterApp/3psw/lpng1634/contrib/pngsuite/basn2c16.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngsuite/basn2c16.png
rename to clusterApp/3psw/lpng1634/contrib/pngsuite/basn2c16.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngsuite/basn3p01.png b/clusterApp/3psw/lpng1634/contrib/pngsuite/basn3p01.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngsuite/basn3p01.png
rename to clusterApp/3psw/lpng1634/contrib/pngsuite/basn3p01.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngsuite/basn3p02.png b/clusterApp/3psw/lpng1634/contrib/pngsuite/basn3p02.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngsuite/basn3p02.png
rename to clusterApp/3psw/lpng1634/contrib/pngsuite/basn3p02.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngsuite/basn3p04.png b/clusterApp/3psw/lpng1634/contrib/pngsuite/basn3p04.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngsuite/basn3p04.png
rename to clusterApp/3psw/lpng1634/contrib/pngsuite/basn3p04.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngsuite/basn3p08.png b/clusterApp/3psw/lpng1634/contrib/pngsuite/basn3p08.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngsuite/basn3p08.png
rename to clusterApp/3psw/lpng1634/contrib/pngsuite/basn3p08.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngsuite/basn4a08.png b/clusterApp/3psw/lpng1634/contrib/pngsuite/basn4a08.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngsuite/basn4a08.png
rename to clusterApp/3psw/lpng1634/contrib/pngsuite/basn4a08.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngsuite/basn4a16.png b/clusterApp/3psw/lpng1634/contrib/pngsuite/basn4a16.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngsuite/basn4a16.png
rename to clusterApp/3psw/lpng1634/contrib/pngsuite/basn4a16.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngsuite/basn6a08.png b/clusterApp/3psw/lpng1634/contrib/pngsuite/basn6a08.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngsuite/basn6a08.png
rename to clusterApp/3psw/lpng1634/contrib/pngsuite/basn6a08.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngsuite/basn6a16.png b/clusterApp/3psw/lpng1634/contrib/pngsuite/basn6a16.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngsuite/basn6a16.png
rename to clusterApp/3psw/lpng1634/contrib/pngsuite/basn6a16.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngsuite/ftbbn0g01.png b/clusterApp/3psw/lpng1634/contrib/pngsuite/ftbbn0g01.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngsuite/ftbbn0g01.png
rename to clusterApp/3psw/lpng1634/contrib/pngsuite/ftbbn0g01.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngsuite/ftbbn0g02.png b/clusterApp/3psw/lpng1634/contrib/pngsuite/ftbbn0g02.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngsuite/ftbbn0g02.png
rename to clusterApp/3psw/lpng1634/contrib/pngsuite/ftbbn0g02.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngsuite/ftbbn0g04.png b/clusterApp/3psw/lpng1634/contrib/pngsuite/ftbbn0g04.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngsuite/ftbbn0g04.png
rename to clusterApp/3psw/lpng1634/contrib/pngsuite/ftbbn0g04.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngsuite/ftbbn2c16.png b/clusterApp/3psw/lpng1634/contrib/pngsuite/ftbbn2c16.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngsuite/ftbbn2c16.png
rename to clusterApp/3psw/lpng1634/contrib/pngsuite/ftbbn2c16.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngsuite/ftbbn3p08.png b/clusterApp/3psw/lpng1634/contrib/pngsuite/ftbbn3p08.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngsuite/ftbbn3p08.png
rename to clusterApp/3psw/lpng1634/contrib/pngsuite/ftbbn3p08.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngsuite/ftbgn2c16.png b/clusterApp/3psw/lpng1634/contrib/pngsuite/ftbgn2c16.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngsuite/ftbgn2c16.png
rename to clusterApp/3psw/lpng1634/contrib/pngsuite/ftbgn2c16.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngsuite/ftbgn3p08.png b/clusterApp/3psw/lpng1634/contrib/pngsuite/ftbgn3p08.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngsuite/ftbgn3p08.png
rename to clusterApp/3psw/lpng1634/contrib/pngsuite/ftbgn3p08.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngsuite/ftbrn2c08.png b/clusterApp/3psw/lpng1634/contrib/pngsuite/ftbrn2c08.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngsuite/ftbrn2c08.png
rename to clusterApp/3psw/lpng1634/contrib/pngsuite/ftbrn2c08.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngsuite/ftbwn0g16.png b/clusterApp/3psw/lpng1634/contrib/pngsuite/ftbwn0g16.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngsuite/ftbwn0g16.png
rename to clusterApp/3psw/lpng1634/contrib/pngsuite/ftbwn0g16.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngsuite/ftbwn3p08.png b/clusterApp/3psw/lpng1634/contrib/pngsuite/ftbwn3p08.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngsuite/ftbwn3p08.png
rename to clusterApp/3psw/lpng1634/contrib/pngsuite/ftbwn3p08.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngsuite/ftbyn3p08.png b/clusterApp/3psw/lpng1634/contrib/pngsuite/ftbyn3p08.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngsuite/ftbyn3p08.png
rename to clusterApp/3psw/lpng1634/contrib/pngsuite/ftbyn3p08.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngsuite/ftp0n0g08.png b/clusterApp/3psw/lpng1634/contrib/pngsuite/ftp0n0g08.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngsuite/ftp0n0g08.png
rename to clusterApp/3psw/lpng1634/contrib/pngsuite/ftp0n0g08.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngsuite/ftp0n2c08.png b/clusterApp/3psw/lpng1634/contrib/pngsuite/ftp0n2c08.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngsuite/ftp0n2c08.png
rename to clusterApp/3psw/lpng1634/contrib/pngsuite/ftp0n2c08.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngsuite/ftp0n3p08.png b/clusterApp/3psw/lpng1634/contrib/pngsuite/ftp0n3p08.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngsuite/ftp0n3p08.png
rename to clusterApp/3psw/lpng1634/contrib/pngsuite/ftp0n3p08.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/pngsuite/ftp1n3p08.png b/clusterApp/3psw/lpng1634/contrib/pngsuite/ftp1n3p08.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/pngsuite/ftp1n3p08.png
rename to clusterApp/3psw/lpng1634/contrib/pngsuite/ftp1n3p08.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-1-1.8-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-1-1.8-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-1-1.8-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-1-1.8-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-1-1.8.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-1-1.8.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-1-1.8.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-1-1.8.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-1-linear-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-1-linear-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-1-linear-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-1-linear-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-1-linear.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-1-linear.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-1-linear.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-1-linear.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-1-sRGB-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-1-sRGB-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-1-sRGB-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-1-sRGB-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-1-sRGB.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-1-sRGB.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-1-sRGB.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-1-sRGB.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-1-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-1-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-1-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-1-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-1.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-1.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-1.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-1.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-16-1.8-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-16-1.8-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-16-1.8-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-16-1.8-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-16-1.8.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-16-1.8.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-16-1.8.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-16-1.8.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-16-linear-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-16-linear-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-16-linear-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-16-linear-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-16-linear.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-16-linear.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-16-linear.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-16-linear.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-16-sRGB-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-16-sRGB-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-16-sRGB-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-16-sRGB-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-16-sRGB.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-16-sRGB.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-16-sRGB.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-16-sRGB.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-16-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-16-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-16-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-16-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-16.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-16.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-16.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-16.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-2-1.8-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-2-1.8-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-2-1.8-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-2-1.8-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-2-1.8.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-2-1.8.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-2-1.8.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-2-1.8.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-2-linear-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-2-linear-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-2-linear-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-2-linear-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-2-linear.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-2-linear.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-2-linear.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-2-linear.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-2-sRGB-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-2-sRGB-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-2-sRGB-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-2-sRGB-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-2-sRGB.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-2-sRGB.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-2-sRGB.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-2-sRGB.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-2-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-2-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-2-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-2-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-2.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-2.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-2.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-2.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-4-1.8-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-4-1.8-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-4-1.8-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-4-1.8-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-4-1.8.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-4-1.8.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-4-1.8.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-4-1.8.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-4-linear-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-4-linear-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-4-linear-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-4-linear-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-4-linear.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-4-linear.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-4-linear.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-4-linear.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-4-sRGB-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-4-sRGB-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-4-sRGB-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-4-sRGB-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-4-sRGB.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-4-sRGB.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-4-sRGB.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-4-sRGB.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-4-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-4-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-4-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-4-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-4.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-4.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-4.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-4.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-8-1.8-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-8-1.8-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-8-1.8-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-8-1.8-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-8-1.8.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-8-1.8.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-8-1.8.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-8-1.8.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-8-linear-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-8-linear-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-8-linear-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-8-linear-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-8-linear.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-8-linear.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-8-linear.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-8-linear.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-8-sRGB-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-8-sRGB-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-8-sRGB-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-8-sRGB-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-8-sRGB.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-8-sRGB.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-8-sRGB.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-8-sRGB.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-8-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-8-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-8-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-8-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-8.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-8.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-8.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-8.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-alpha-16-1.8.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-alpha-16-1.8.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-alpha-16-1.8.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-alpha-16-1.8.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-alpha-16-linear.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-alpha-16-linear.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-alpha-16-linear.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-alpha-16-linear.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-alpha-16-sRGB.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-alpha-16-sRGB.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-alpha-16-sRGB.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-alpha-16-sRGB.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-alpha-16.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-alpha-16.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-alpha-16.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-alpha-16.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-alpha-8-1.8.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-alpha-8-1.8.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-alpha-8-1.8.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-alpha-8-1.8.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-alpha-8-linear.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-alpha-8-linear.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-alpha-8-linear.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-alpha-8-linear.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-alpha-8-sRGB.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-alpha-8-sRGB.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-alpha-8-sRGB.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-alpha-8-sRGB.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-alpha-8.png b/clusterApp/3psw/lpng1634/contrib/testpngs/gray-alpha-8.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/gray-alpha-8.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/gray-alpha-8.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-1-1.8-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/palette-1-1.8-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-1-1.8-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/palette-1-1.8-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-1-1.8.png b/clusterApp/3psw/lpng1634/contrib/testpngs/palette-1-1.8.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-1-1.8.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/palette-1-1.8.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-1-linear-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/palette-1-linear-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-1-linear-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/palette-1-linear-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-1-linear.png b/clusterApp/3psw/lpng1634/contrib/testpngs/palette-1-linear.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-1-linear.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/palette-1-linear.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-1-sRGB-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/palette-1-sRGB-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-1-sRGB-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/palette-1-sRGB-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-1-sRGB.png b/clusterApp/3psw/lpng1634/contrib/testpngs/palette-1-sRGB.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-1-sRGB.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/palette-1-sRGB.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-1-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/palette-1-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-1-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/palette-1-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-1.png b/clusterApp/3psw/lpng1634/contrib/testpngs/palette-1.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-1.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/palette-1.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-2-1.8-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/palette-2-1.8-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-2-1.8-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/palette-2-1.8-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-2-1.8.png b/clusterApp/3psw/lpng1634/contrib/testpngs/palette-2-1.8.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-2-1.8.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/palette-2-1.8.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-2-linear-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/palette-2-linear-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-2-linear-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/palette-2-linear-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-2-linear.png b/clusterApp/3psw/lpng1634/contrib/testpngs/palette-2-linear.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-2-linear.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/palette-2-linear.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-2-sRGB-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/palette-2-sRGB-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-2-sRGB-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/palette-2-sRGB-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-2-sRGB.png b/clusterApp/3psw/lpng1634/contrib/testpngs/palette-2-sRGB.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-2-sRGB.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/palette-2-sRGB.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-2-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/palette-2-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-2-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/palette-2-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-2.png b/clusterApp/3psw/lpng1634/contrib/testpngs/palette-2.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-2.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/palette-2.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-4-1.8-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/palette-4-1.8-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-4-1.8-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/palette-4-1.8-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-4-1.8.png b/clusterApp/3psw/lpng1634/contrib/testpngs/palette-4-1.8.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-4-1.8.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/palette-4-1.8.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-4-linear-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/palette-4-linear-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-4-linear-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/palette-4-linear-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-4-linear.png b/clusterApp/3psw/lpng1634/contrib/testpngs/palette-4-linear.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-4-linear.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/palette-4-linear.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-4-sRGB-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/palette-4-sRGB-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-4-sRGB-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/palette-4-sRGB-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-4-sRGB.png b/clusterApp/3psw/lpng1634/contrib/testpngs/palette-4-sRGB.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-4-sRGB.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/palette-4-sRGB.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-4-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/palette-4-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-4-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/palette-4-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-4.png b/clusterApp/3psw/lpng1634/contrib/testpngs/palette-4.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-4.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/palette-4.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-8-1.8-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/palette-8-1.8-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-8-1.8-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/palette-8-1.8-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-8-1.8.png b/clusterApp/3psw/lpng1634/contrib/testpngs/palette-8-1.8.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-8-1.8.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/palette-8-1.8.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-8-linear-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/palette-8-linear-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-8-linear-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/palette-8-linear-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-8-linear.png b/clusterApp/3psw/lpng1634/contrib/testpngs/palette-8-linear.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-8-linear.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/palette-8-linear.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-8-sRGB-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/palette-8-sRGB-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-8-sRGB-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/palette-8-sRGB-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-8-sRGB.png b/clusterApp/3psw/lpng1634/contrib/testpngs/palette-8-sRGB.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-8-sRGB.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/palette-8-sRGB.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-8-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/palette-8-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-8-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/palette-8-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-8.png b/clusterApp/3psw/lpng1634/contrib/testpngs/palette-8.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/palette-8.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/palette-8.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-16-1.8-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/rgb-16-1.8-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-16-1.8-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/rgb-16-1.8-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-16-1.8.png b/clusterApp/3psw/lpng1634/contrib/testpngs/rgb-16-1.8.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-16-1.8.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/rgb-16-1.8.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-16-linear-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/rgb-16-linear-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-16-linear-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/rgb-16-linear-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-16-linear.png b/clusterApp/3psw/lpng1634/contrib/testpngs/rgb-16-linear.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-16-linear.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/rgb-16-linear.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-16-sRGB-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/rgb-16-sRGB-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-16-sRGB-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/rgb-16-sRGB-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-16-sRGB.png b/clusterApp/3psw/lpng1634/contrib/testpngs/rgb-16-sRGB.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-16-sRGB.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/rgb-16-sRGB.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-16-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/rgb-16-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-16-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/rgb-16-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-16.png b/clusterApp/3psw/lpng1634/contrib/testpngs/rgb-16.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-16.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/rgb-16.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-8-1.8-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/rgb-8-1.8-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-8-1.8-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/rgb-8-1.8-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-8-1.8.png b/clusterApp/3psw/lpng1634/contrib/testpngs/rgb-8-1.8.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-8-1.8.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/rgb-8-1.8.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-8-linear-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/rgb-8-linear-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-8-linear-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/rgb-8-linear-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-8-linear.png b/clusterApp/3psw/lpng1634/contrib/testpngs/rgb-8-linear.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-8-linear.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/rgb-8-linear.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-8-sRGB-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/rgb-8-sRGB-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-8-sRGB-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/rgb-8-sRGB-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-8-sRGB.png b/clusterApp/3psw/lpng1634/contrib/testpngs/rgb-8-sRGB.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-8-sRGB.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/rgb-8-sRGB.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-8-tRNS.png b/clusterApp/3psw/lpng1634/contrib/testpngs/rgb-8-tRNS.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-8-tRNS.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/rgb-8-tRNS.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-8.png b/clusterApp/3psw/lpng1634/contrib/testpngs/rgb-8.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-8.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/rgb-8.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-alpha-16-1.8.png b/clusterApp/3psw/lpng1634/contrib/testpngs/rgb-alpha-16-1.8.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-alpha-16-1.8.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/rgb-alpha-16-1.8.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-alpha-16-linear.png b/clusterApp/3psw/lpng1634/contrib/testpngs/rgb-alpha-16-linear.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-alpha-16-linear.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/rgb-alpha-16-linear.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-alpha-16-sRGB.png b/clusterApp/3psw/lpng1634/contrib/testpngs/rgb-alpha-16-sRGB.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-alpha-16-sRGB.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/rgb-alpha-16-sRGB.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-alpha-16.png b/clusterApp/3psw/lpng1634/contrib/testpngs/rgb-alpha-16.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-alpha-16.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/rgb-alpha-16.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-alpha-8-1.8.png b/clusterApp/3psw/lpng1634/contrib/testpngs/rgb-alpha-8-1.8.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-alpha-8-1.8.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/rgb-alpha-8-1.8.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-alpha-8-linear.png b/clusterApp/3psw/lpng1634/contrib/testpngs/rgb-alpha-8-linear.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-alpha-8-linear.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/rgb-alpha-8-linear.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-alpha-8-sRGB.png b/clusterApp/3psw/lpng1634/contrib/testpngs/rgb-alpha-8-sRGB.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-alpha-8-sRGB.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/rgb-alpha-8-sRGB.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-alpha-8.png b/clusterApp/3psw/lpng1634/contrib/testpngs/rgb-alpha-8.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/testpngs/rgb-alpha-8.png
rename to clusterApp/3psw/lpng1634/contrib/testpngs/rgb-alpha-8.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/tools/README.txt b/clusterApp/3psw/lpng1634/contrib/tools/README.txt
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/tools/README.txt
rename to clusterApp/3psw/lpng1634/contrib/tools/README.txt
diff --git a/insDavi2.0/3psw/lpng1634/contrib/tools/checksum-icc.c b/clusterApp/3psw/lpng1634/contrib/tools/checksum-icc.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/tools/checksum-icc.c
rename to clusterApp/3psw/lpng1634/contrib/tools/checksum-icc.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/tools/chkfmt b/clusterApp/3psw/lpng1634/contrib/tools/chkfmt
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/tools/chkfmt
rename to clusterApp/3psw/lpng1634/contrib/tools/chkfmt
diff --git a/insDavi2.0/3psw/lpng1634/contrib/tools/cvtcolor.c b/clusterApp/3psw/lpng1634/contrib/tools/cvtcolor.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/tools/cvtcolor.c
rename to clusterApp/3psw/lpng1634/contrib/tools/cvtcolor.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/tools/genpng.c b/clusterApp/3psw/lpng1634/contrib/tools/genpng.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/tools/genpng.c
rename to clusterApp/3psw/lpng1634/contrib/tools/genpng.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/tools/intgamma.sh b/clusterApp/3psw/lpng1634/contrib/tools/intgamma.sh
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/tools/intgamma.sh
rename to clusterApp/3psw/lpng1634/contrib/tools/intgamma.sh
diff --git a/insDavi2.0/3psw/lpng1634/contrib/tools/makesRGB.c b/clusterApp/3psw/lpng1634/contrib/tools/makesRGB.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/tools/makesRGB.c
rename to clusterApp/3psw/lpng1634/contrib/tools/makesRGB.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/tools/png-fix-itxt.c b/clusterApp/3psw/lpng1634/contrib/tools/png-fix-itxt.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/tools/png-fix-itxt.c
rename to clusterApp/3psw/lpng1634/contrib/tools/png-fix-itxt.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/tools/pngcp.c b/clusterApp/3psw/lpng1634/contrib/tools/pngcp.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/tools/pngcp.c
rename to clusterApp/3psw/lpng1634/contrib/tools/pngcp.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/tools/pngfix.c b/clusterApp/3psw/lpng1634/contrib/tools/pngfix.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/tools/pngfix.c
rename to clusterApp/3psw/lpng1634/contrib/tools/pngfix.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/tools/reindent b/clusterApp/3psw/lpng1634/contrib/tools/reindent
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/tools/reindent
rename to clusterApp/3psw/lpng1634/contrib/tools/reindent
diff --git a/insDavi2.0/3psw/lpng1634/contrib/tools/sRGB.h b/clusterApp/3psw/lpng1634/contrib/tools/sRGB.h
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/tools/sRGB.h
rename to clusterApp/3psw/lpng1634/contrib/tools/sRGB.h
diff --git a/insDavi2.0/3psw/lpng1634/contrib/visupng/PngFile.c b/clusterApp/3psw/lpng1634/contrib/visupng/PngFile.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/visupng/PngFile.c
rename to clusterApp/3psw/lpng1634/contrib/visupng/PngFile.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/visupng/PngFile.h b/clusterApp/3psw/lpng1634/contrib/visupng/PngFile.h
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/visupng/PngFile.h
rename to clusterApp/3psw/lpng1634/contrib/visupng/PngFile.h
diff --git a/insDavi2.0/3psw/lpng1634/contrib/visupng/README.txt b/clusterApp/3psw/lpng1634/contrib/visupng/README.txt
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/visupng/README.txt
rename to clusterApp/3psw/lpng1634/contrib/visupng/README.txt
diff --git a/insDavi2.0/3psw/lpng1634/contrib/visupng/VisualPng.c b/clusterApp/3psw/lpng1634/contrib/visupng/VisualPng.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/visupng/VisualPng.c
rename to clusterApp/3psw/lpng1634/contrib/visupng/VisualPng.c
diff --git a/insDavi2.0/3psw/lpng1634/contrib/visupng/VisualPng.dsp b/clusterApp/3psw/lpng1634/contrib/visupng/VisualPng.dsp
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/visupng/VisualPng.dsp
rename to clusterApp/3psw/lpng1634/contrib/visupng/VisualPng.dsp
diff --git a/insDavi2.0/3psw/lpng1634/contrib/visupng/VisualPng.dsw b/clusterApp/3psw/lpng1634/contrib/visupng/VisualPng.dsw
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/visupng/VisualPng.dsw
rename to clusterApp/3psw/lpng1634/contrib/visupng/VisualPng.dsw
diff --git a/insDavi2.0/3psw/lpng1634/contrib/visupng/VisualPng.png b/clusterApp/3psw/lpng1634/contrib/visupng/VisualPng.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/visupng/VisualPng.png
rename to clusterApp/3psw/lpng1634/contrib/visupng/VisualPng.png
diff --git a/insDavi2.0/3psw/lpng1634/contrib/visupng/VisualPng.rc b/clusterApp/3psw/lpng1634/contrib/visupng/VisualPng.rc
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/visupng/VisualPng.rc
rename to clusterApp/3psw/lpng1634/contrib/visupng/VisualPng.rc
diff --git a/insDavi2.0/3psw/lpng1634/contrib/visupng/cexcept.h b/clusterApp/3psw/lpng1634/contrib/visupng/cexcept.h
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/visupng/cexcept.h
rename to clusterApp/3psw/lpng1634/contrib/visupng/cexcept.h
diff --git a/insDavi2.0/3psw/lpng1634/contrib/visupng/resource.h b/clusterApp/3psw/lpng1634/contrib/visupng/resource.h
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/contrib/visupng/resource.h
rename to clusterApp/3psw/lpng1634/contrib/visupng/resource.h
diff --git a/insDavi2.0/3psw/lpng1634/example.c b/clusterApp/3psw/lpng1634/example.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/example.c
rename to clusterApp/3psw/lpng1634/example.c
diff --git a/insDavi2.0/3psw/lpng1634/libpng-config.in b/clusterApp/3psw/lpng1634/libpng-config.in
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/libpng-config.in
rename to clusterApp/3psw/lpng1634/libpng-config.in
diff --git a/insDavi2.0/3psw/lpng1634/libpng-manual.txt b/clusterApp/3psw/lpng1634/libpng-manual.txt
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/libpng-manual.txt
rename to clusterApp/3psw/lpng1634/libpng-manual.txt
diff --git a/insDavi2.0/3psw/lpng1634/libpng.3 b/clusterApp/3psw/lpng1634/libpng.3
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/libpng.3
rename to clusterApp/3psw/lpng1634/libpng.3
diff --git a/insDavi2.0/3psw/lpng1634/libpng.pc.in b/clusterApp/3psw/lpng1634/libpng.pc.in
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/libpng.pc.in
rename to clusterApp/3psw/lpng1634/libpng.pc.in
diff --git a/insDavi2.0/3psw/lpng1634/libpngpf.3 b/clusterApp/3psw/lpng1634/libpngpf.3
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/libpngpf.3
rename to clusterApp/3psw/lpng1634/libpngpf.3
diff --git a/insDavi2.0/3psw/lpng1634/lpng_built/libpng.a b/clusterApp/3psw/lpng1634/lpng_built/libpng.a
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/lpng_built/libpng.a
rename to clusterApp/3psw/lpng1634/lpng_built/libpng.a
diff --git a/insDavi2.0/3psw/lpng1634/lpng_built/libpng.dll.a b/clusterApp/3psw/lpng1634/lpng_built/libpng.dll.a
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/lpng_built/libpng.dll.a
rename to clusterApp/3psw/lpng1634/lpng_built/libpng.dll.a
diff --git a/insDavi2.0/3psw/lpng1634/lpng_built/libpng16.a b/clusterApp/3psw/lpng1634/lpng_built/libpng16.a
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/lpng_built/libpng16.a
rename to clusterApp/3psw/lpng1634/lpng_built/libpng16.a
diff --git a/insDavi2.0/3psw/lpng1634/lpng_built/libpng16.dll b/clusterApp/3psw/lpng1634/lpng_built/libpng16.dll
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/lpng_built/libpng16.dll
rename to clusterApp/3psw/lpng1634/lpng_built/libpng16.dll
diff --git a/insDavi2.0/3psw/lpng1634/lpng_built/libpng16.dll.a b/clusterApp/3psw/lpng1634/lpng_built/libpng16.dll.a
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/lpng_built/libpng16.dll.a
rename to clusterApp/3psw/lpng1634/lpng_built/libpng16.dll.a
diff --git a/insDavi2.0/3psw/lpng1634/lpng_built/libzlib.dll b/clusterApp/3psw/lpng1634/lpng_built/libzlib.dll
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/lpng_built/libzlib.dll
rename to clusterApp/3psw/lpng1634/lpng_built/libzlib.dll
diff --git a/insDavi2.0/3psw/lpng1634/lpng_built/png-fix-itxt.exe b/clusterApp/3psw/lpng1634/lpng_built/png-fix-itxt.exe
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/lpng_built/png-fix-itxt.exe
rename to clusterApp/3psw/lpng1634/lpng_built/png-fix-itxt.exe
diff --git a/insDavi2.0/3psw/lpng1634/lpng_built/pngfix.exe b/clusterApp/3psw/lpng1634/lpng_built/pngfix.exe
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/lpng_built/pngfix.exe
rename to clusterApp/3psw/lpng1634/lpng_built/pngfix.exe
diff --git a/insDavi2.0/3psw/lpng1634/lpng_built/pngimage.exe b/clusterApp/3psw/lpng1634/lpng_built/pngimage.exe
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/lpng_built/pngimage.exe
rename to clusterApp/3psw/lpng1634/lpng_built/pngimage.exe
diff --git a/insDavi2.0/3psw/lpng1634/lpng_built/pngstest.exe b/clusterApp/3psw/lpng1634/lpng_built/pngstest.exe
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/lpng_built/pngstest.exe
rename to clusterApp/3psw/lpng1634/lpng_built/pngstest.exe
diff --git a/insDavi2.0/3psw/lpng1634/lpng_built/pngtest.exe b/clusterApp/3psw/lpng1634/lpng_built/pngtest.exe
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/lpng_built/pngtest.exe
rename to clusterApp/3psw/lpng1634/lpng_built/pngtest.exe
diff --git a/insDavi2.0/3psw/lpng1634/lpng_built/pngunknown.exe b/clusterApp/3psw/lpng1634/lpng_built/pngunknown.exe
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/lpng_built/pngunknown.exe
rename to clusterApp/3psw/lpng1634/lpng_built/pngunknown.exe
diff --git a/insDavi2.0/3psw/lpng1634/lpng_built/pngvalid.exe b/clusterApp/3psw/lpng1634/lpng_built/pngvalid.exe
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/lpng_built/pngvalid.exe
rename to clusterApp/3psw/lpng1634/lpng_built/pngvalid.exe
diff --git a/insDavi2.0/3psw/lpng1634/lpng_built/test.log b/clusterApp/3psw/lpng1634/lpng_built/test.log
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/lpng_built/test.log
rename to clusterApp/3psw/lpng1634/lpng_built/test.log
diff --git a/insDavi2.0/3psw/lpng1634/png.5 b/clusterApp/3psw/lpng1634/png.5
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/png.5
rename to clusterApp/3psw/lpng1634/png.5
diff --git a/insDavi2.0/3psw/lpng1634/png.c b/clusterApp/3psw/lpng1634/png.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/png.c
rename to clusterApp/3psw/lpng1634/png.c
diff --git a/insDavi2.0/3psw/lpng1634/png.h b/clusterApp/3psw/lpng1634/png.h
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/png.h
rename to clusterApp/3psw/lpng1634/png.h
diff --git a/insDavi2.0/3psw/lpng1634/pngbar.jpg b/clusterApp/3psw/lpng1634/pngbar.jpg
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/pngbar.jpg
rename to clusterApp/3psw/lpng1634/pngbar.jpg
diff --git a/insDavi2.0/3psw/lpng1634/pngbar.png b/clusterApp/3psw/lpng1634/pngbar.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/pngbar.png
rename to clusterApp/3psw/lpng1634/pngbar.png
diff --git a/insDavi2.0/3psw/lpng1634/pngconf.h b/clusterApp/3psw/lpng1634/pngconf.h
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/pngconf.h
rename to clusterApp/3psw/lpng1634/pngconf.h
diff --git a/insDavi2.0/3psw/lpng1634/pngdebug.h b/clusterApp/3psw/lpng1634/pngdebug.h
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/pngdebug.h
rename to clusterApp/3psw/lpng1634/pngdebug.h
diff --git a/insDavi2.0/3psw/lpng1634/pngerror.c b/clusterApp/3psw/lpng1634/pngerror.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/pngerror.c
rename to clusterApp/3psw/lpng1634/pngerror.c
diff --git a/insDavi2.0/3psw/lpng1634/pngget.c b/clusterApp/3psw/lpng1634/pngget.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/pngget.c
rename to clusterApp/3psw/lpng1634/pngget.c
diff --git a/insDavi2.0/3psw/lpng1634/pnginfo.h b/clusterApp/3psw/lpng1634/pnginfo.h
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/pnginfo.h
rename to clusterApp/3psw/lpng1634/pnginfo.h
diff --git a/insDavi2.0/3psw/lpng1634/pnglibconf.h b/clusterApp/3psw/lpng1634/pnglibconf.h
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/pnglibconf.h
rename to clusterApp/3psw/lpng1634/pnglibconf.h
diff --git a/insDavi2.0/3psw/lpng1634/pngmem.c b/clusterApp/3psw/lpng1634/pngmem.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/pngmem.c
rename to clusterApp/3psw/lpng1634/pngmem.c
diff --git a/insDavi2.0/3psw/lpng1634/pngnow.png b/clusterApp/3psw/lpng1634/pngnow.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/pngnow.png
rename to clusterApp/3psw/lpng1634/pngnow.png
diff --git a/insDavi2.0/3psw/lpng1634/pngpread.c b/clusterApp/3psw/lpng1634/pngpread.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/pngpread.c
rename to clusterApp/3psw/lpng1634/pngpread.c
diff --git a/insDavi2.0/3psw/lpng1634/pngpriv.h b/clusterApp/3psw/lpng1634/pngpriv.h
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/pngpriv.h
rename to clusterApp/3psw/lpng1634/pngpriv.h
diff --git a/insDavi2.0/3psw/lpng1634/pngread.c b/clusterApp/3psw/lpng1634/pngread.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/pngread.c
rename to clusterApp/3psw/lpng1634/pngread.c
diff --git a/insDavi2.0/3psw/lpng1634/pngrio.c b/clusterApp/3psw/lpng1634/pngrio.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/pngrio.c
rename to clusterApp/3psw/lpng1634/pngrio.c
diff --git a/insDavi2.0/3psw/lpng1634/pngrtran.c b/clusterApp/3psw/lpng1634/pngrtran.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/pngrtran.c
rename to clusterApp/3psw/lpng1634/pngrtran.c
diff --git a/insDavi2.0/3psw/lpng1634/pngrutil.c b/clusterApp/3psw/lpng1634/pngrutil.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/pngrutil.c
rename to clusterApp/3psw/lpng1634/pngrutil.c
diff --git a/insDavi2.0/3psw/lpng1634/pngset.c b/clusterApp/3psw/lpng1634/pngset.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/pngset.c
rename to clusterApp/3psw/lpng1634/pngset.c
diff --git a/insDavi2.0/3psw/lpng1634/pngstruct.h b/clusterApp/3psw/lpng1634/pngstruct.h
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/pngstruct.h
rename to clusterApp/3psw/lpng1634/pngstruct.h
diff --git a/insDavi2.0/3psw/lpng1634/pngtest.c b/clusterApp/3psw/lpng1634/pngtest.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/pngtest.c
rename to clusterApp/3psw/lpng1634/pngtest.c
diff --git a/insDavi2.0/3psw/lpng1634/pngtest.png b/clusterApp/3psw/lpng1634/pngtest.png
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/pngtest.png
rename to clusterApp/3psw/lpng1634/pngtest.png
diff --git a/insDavi2.0/3psw/lpng1634/pngtrans.c b/clusterApp/3psw/lpng1634/pngtrans.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/pngtrans.c
rename to clusterApp/3psw/lpng1634/pngtrans.c
diff --git a/insDavi2.0/3psw/lpng1634/pngwio.c b/clusterApp/3psw/lpng1634/pngwio.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/pngwio.c
rename to clusterApp/3psw/lpng1634/pngwio.c
diff --git a/insDavi2.0/3psw/lpng1634/pngwrite.c b/clusterApp/3psw/lpng1634/pngwrite.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/pngwrite.c
rename to clusterApp/3psw/lpng1634/pngwrite.c
diff --git a/insDavi2.0/3psw/lpng1634/pngwtran.c b/clusterApp/3psw/lpng1634/pngwtran.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/pngwtran.c
rename to clusterApp/3psw/lpng1634/pngwtran.c
diff --git a/insDavi2.0/3psw/lpng1634/pngwutil.c b/clusterApp/3psw/lpng1634/pngwutil.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/pngwutil.c
rename to clusterApp/3psw/lpng1634/pngwutil.c
diff --git a/insDavi2.0/3psw/lpng1634/projects/owatcom/libpng.tgt b/clusterApp/3psw/lpng1634/projects/owatcom/libpng.tgt
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/projects/owatcom/libpng.tgt
rename to clusterApp/3psw/lpng1634/projects/owatcom/libpng.tgt
diff --git a/insDavi2.0/3psw/lpng1634/projects/owatcom/libpng.wpj b/clusterApp/3psw/lpng1634/projects/owatcom/libpng.wpj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/projects/owatcom/libpng.wpj
rename to clusterApp/3psw/lpng1634/projects/owatcom/libpng.wpj
diff --git a/insDavi2.0/3psw/lpng1634/projects/owatcom/pngconfig.mak b/clusterApp/3psw/lpng1634/projects/owatcom/pngconfig.mak
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/projects/owatcom/pngconfig.mak
rename to clusterApp/3psw/lpng1634/projects/owatcom/pngconfig.mak
diff --git a/insDavi2.0/3psw/lpng1634/projects/owatcom/pngstest.tgt b/clusterApp/3psw/lpng1634/projects/owatcom/pngstest.tgt
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/projects/owatcom/pngstest.tgt
rename to clusterApp/3psw/lpng1634/projects/owatcom/pngstest.tgt
diff --git a/insDavi2.0/3psw/lpng1634/projects/owatcom/pngtest.tgt b/clusterApp/3psw/lpng1634/projects/owatcom/pngtest.tgt
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/projects/owatcom/pngtest.tgt
rename to clusterApp/3psw/lpng1634/projects/owatcom/pngtest.tgt
diff --git a/insDavi2.0/3psw/lpng1634/projects/owatcom/pngvalid.tgt b/clusterApp/3psw/lpng1634/projects/owatcom/pngvalid.tgt
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/projects/owatcom/pngvalid.tgt
rename to clusterApp/3psw/lpng1634/projects/owatcom/pngvalid.tgt
diff --git a/insDavi2.0/3psw/lpng1634/projects/visualc71/PRJ0041.mak b/clusterApp/3psw/lpng1634/projects/visualc71/PRJ0041.mak
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/projects/visualc71/PRJ0041.mak
rename to clusterApp/3psw/lpng1634/projects/visualc71/PRJ0041.mak
diff --git a/insDavi2.0/3psw/lpng1634/projects/visualc71/README.txt b/clusterApp/3psw/lpng1634/projects/visualc71/README.txt
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/projects/visualc71/README.txt
rename to clusterApp/3psw/lpng1634/projects/visualc71/README.txt
diff --git a/insDavi2.0/3psw/lpng1634/projects/visualc71/README_zlib.txt b/clusterApp/3psw/lpng1634/projects/visualc71/README_zlib.txt
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/projects/visualc71/README_zlib.txt
rename to clusterApp/3psw/lpng1634/projects/visualc71/README_zlib.txt
diff --git a/insDavi2.0/3psw/lpng1634/projects/visualc71/libpng.sln b/clusterApp/3psw/lpng1634/projects/visualc71/libpng.sln
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/projects/visualc71/libpng.sln
rename to clusterApp/3psw/lpng1634/projects/visualc71/libpng.sln
diff --git a/insDavi2.0/3psw/lpng1634/projects/visualc71/libpng.vcproj b/clusterApp/3psw/lpng1634/projects/visualc71/libpng.vcproj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/projects/visualc71/libpng.vcproj
rename to clusterApp/3psw/lpng1634/projects/visualc71/libpng.vcproj
diff --git a/insDavi2.0/3psw/lpng1634/projects/visualc71/pngtest.vcproj b/clusterApp/3psw/lpng1634/projects/visualc71/pngtest.vcproj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/projects/visualc71/pngtest.vcproj
rename to clusterApp/3psw/lpng1634/projects/visualc71/pngtest.vcproj
diff --git a/insDavi2.0/3psw/lpng1634/projects/visualc71/zlib.vcproj b/clusterApp/3psw/lpng1634/projects/visualc71/zlib.vcproj
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/projects/visualc71/zlib.vcproj
rename to clusterApp/3psw/lpng1634/projects/visualc71/zlib.vcproj
diff --git a/insDavi2.0/3psw/lpng1634/scripts/README.txt b/clusterApp/3psw/lpng1634/scripts/README.txt
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/README.txt
rename to clusterApp/3psw/lpng1634/scripts/README.txt
diff --git a/insDavi2.0/3psw/lpng1634/scripts/SCOPTIONS.ppc b/clusterApp/3psw/lpng1634/scripts/SCOPTIONS.ppc
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/SCOPTIONS.ppc
rename to clusterApp/3psw/lpng1634/scripts/SCOPTIONS.ppc
diff --git a/insDavi2.0/3psw/lpng1634/scripts/checksym.awk b/clusterApp/3psw/lpng1634/scripts/checksym.awk
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/checksym.awk
rename to clusterApp/3psw/lpng1634/scripts/checksym.awk
diff --git a/insDavi2.0/3psw/lpng1634/scripts/def.c b/clusterApp/3psw/lpng1634/scripts/def.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/def.c
rename to clusterApp/3psw/lpng1634/scripts/def.c
diff --git a/insDavi2.0/3psw/lpng1634/scripts/descrip.mms b/clusterApp/3psw/lpng1634/scripts/descrip.mms
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/descrip.mms
rename to clusterApp/3psw/lpng1634/scripts/descrip.mms
diff --git a/insDavi2.0/3psw/lpng1634/scripts/dfn.awk b/clusterApp/3psw/lpng1634/scripts/dfn.awk
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/dfn.awk
rename to clusterApp/3psw/lpng1634/scripts/dfn.awk
diff --git a/insDavi2.0/3psw/lpng1634/scripts/genchk.cmake.in b/clusterApp/3psw/lpng1634/scripts/genchk.cmake.in
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/genchk.cmake.in
rename to clusterApp/3psw/lpng1634/scripts/genchk.cmake.in
diff --git a/insDavi2.0/3psw/lpng1634/scripts/genout.cmake.in b/clusterApp/3psw/lpng1634/scripts/genout.cmake.in
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/genout.cmake.in
rename to clusterApp/3psw/lpng1634/scripts/genout.cmake.in
diff --git a/insDavi2.0/3psw/lpng1634/scripts/gensrc.cmake.in b/clusterApp/3psw/lpng1634/scripts/gensrc.cmake.in
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/gensrc.cmake.in
rename to clusterApp/3psw/lpng1634/scripts/gensrc.cmake.in
diff --git a/insDavi2.0/3psw/lpng1634/scripts/intprefix.c b/clusterApp/3psw/lpng1634/scripts/intprefix.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/intprefix.c
rename to clusterApp/3psw/lpng1634/scripts/intprefix.c
diff --git a/insDavi2.0/3psw/lpng1634/scripts/libpng-config-body.in b/clusterApp/3psw/lpng1634/scripts/libpng-config-body.in
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/libpng-config-body.in
rename to clusterApp/3psw/lpng1634/scripts/libpng-config-body.in
diff --git a/insDavi2.0/3psw/lpng1634/scripts/libpng-config-head.in b/clusterApp/3psw/lpng1634/scripts/libpng-config-head.in
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/libpng-config-head.in
rename to clusterApp/3psw/lpng1634/scripts/libpng-config-head.in
diff --git a/insDavi2.0/3psw/lpng1634/scripts/libpng.pc.in b/clusterApp/3psw/lpng1634/scripts/libpng.pc.in
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/libpng.pc.in
rename to clusterApp/3psw/lpng1634/scripts/libpng.pc.in
diff --git a/insDavi2.0/3psw/lpng1634/scripts/macro.lst b/clusterApp/3psw/lpng1634/scripts/macro.lst
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/macro.lst
rename to clusterApp/3psw/lpng1634/scripts/macro.lst
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.32sunu b/clusterApp/3psw/lpng1634/scripts/makefile.32sunu
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.32sunu
rename to clusterApp/3psw/lpng1634/scripts/makefile.32sunu
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.64sunu b/clusterApp/3psw/lpng1634/scripts/makefile.64sunu
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.64sunu
rename to clusterApp/3psw/lpng1634/scripts/makefile.64sunu
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.acorn b/clusterApp/3psw/lpng1634/scripts/makefile.acorn
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.acorn
rename to clusterApp/3psw/lpng1634/scripts/makefile.acorn
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.aix b/clusterApp/3psw/lpng1634/scripts/makefile.aix
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.aix
rename to clusterApp/3psw/lpng1634/scripts/makefile.aix
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.amiga b/clusterApp/3psw/lpng1634/scripts/makefile.amiga
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.amiga
rename to clusterApp/3psw/lpng1634/scripts/makefile.amiga
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.atari b/clusterApp/3psw/lpng1634/scripts/makefile.atari
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.atari
rename to clusterApp/3psw/lpng1634/scripts/makefile.atari
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.bc32 b/clusterApp/3psw/lpng1634/scripts/makefile.bc32
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.bc32
rename to clusterApp/3psw/lpng1634/scripts/makefile.bc32
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.beos b/clusterApp/3psw/lpng1634/scripts/makefile.beos
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.beos
rename to clusterApp/3psw/lpng1634/scripts/makefile.beos
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.bor b/clusterApp/3psw/lpng1634/scripts/makefile.bor
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.bor
rename to clusterApp/3psw/lpng1634/scripts/makefile.bor
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.cegcc b/clusterApp/3psw/lpng1634/scripts/makefile.cegcc
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.cegcc
rename to clusterApp/3psw/lpng1634/scripts/makefile.cegcc
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.darwin b/clusterApp/3psw/lpng1634/scripts/makefile.darwin
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.darwin
rename to clusterApp/3psw/lpng1634/scripts/makefile.darwin
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.dec b/clusterApp/3psw/lpng1634/scripts/makefile.dec
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.dec
rename to clusterApp/3psw/lpng1634/scripts/makefile.dec
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.dj2 b/clusterApp/3psw/lpng1634/scripts/makefile.dj2
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.dj2
rename to clusterApp/3psw/lpng1634/scripts/makefile.dj2
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.freebsd b/clusterApp/3psw/lpng1634/scripts/makefile.freebsd
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.freebsd
rename to clusterApp/3psw/lpng1634/scripts/makefile.freebsd
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.gcc b/clusterApp/3psw/lpng1634/scripts/makefile.gcc
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.gcc
rename to clusterApp/3psw/lpng1634/scripts/makefile.gcc
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.hp64 b/clusterApp/3psw/lpng1634/scripts/makefile.hp64
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.hp64
rename to clusterApp/3psw/lpng1634/scripts/makefile.hp64
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.hpgcc b/clusterApp/3psw/lpng1634/scripts/makefile.hpgcc
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.hpgcc
rename to clusterApp/3psw/lpng1634/scripts/makefile.hpgcc
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.hpux b/clusterApp/3psw/lpng1634/scripts/makefile.hpux
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.hpux
rename to clusterApp/3psw/lpng1634/scripts/makefile.hpux
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.ibmc b/clusterApp/3psw/lpng1634/scripts/makefile.ibmc
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.ibmc
rename to clusterApp/3psw/lpng1634/scripts/makefile.ibmc
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.intel b/clusterApp/3psw/lpng1634/scripts/makefile.intel
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.intel
rename to clusterApp/3psw/lpng1634/scripts/makefile.intel
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.knr b/clusterApp/3psw/lpng1634/scripts/makefile.knr
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.knr
rename to clusterApp/3psw/lpng1634/scripts/makefile.knr
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.linux b/clusterApp/3psw/lpng1634/scripts/makefile.linux
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.linux
rename to clusterApp/3psw/lpng1634/scripts/makefile.linux
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.linux-opt b/clusterApp/3psw/lpng1634/scripts/makefile.linux-opt
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.linux-opt
rename to clusterApp/3psw/lpng1634/scripts/makefile.linux-opt
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.mips b/clusterApp/3psw/lpng1634/scripts/makefile.mips
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.mips
rename to clusterApp/3psw/lpng1634/scripts/makefile.mips
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.msc b/clusterApp/3psw/lpng1634/scripts/makefile.msc
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.msc
rename to clusterApp/3psw/lpng1634/scripts/makefile.msc
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.msys b/clusterApp/3psw/lpng1634/scripts/makefile.msys
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.msys
rename to clusterApp/3psw/lpng1634/scripts/makefile.msys
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.ne12bsd b/clusterApp/3psw/lpng1634/scripts/makefile.ne12bsd
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.ne12bsd
rename to clusterApp/3psw/lpng1634/scripts/makefile.ne12bsd
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.netbsd b/clusterApp/3psw/lpng1634/scripts/makefile.netbsd
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.netbsd
rename to clusterApp/3psw/lpng1634/scripts/makefile.netbsd
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.openbsd b/clusterApp/3psw/lpng1634/scripts/makefile.openbsd
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.openbsd
rename to clusterApp/3psw/lpng1634/scripts/makefile.openbsd
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.sggcc b/clusterApp/3psw/lpng1634/scripts/makefile.sggcc
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.sggcc
rename to clusterApp/3psw/lpng1634/scripts/makefile.sggcc
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.sgi b/clusterApp/3psw/lpng1634/scripts/makefile.sgi
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.sgi
rename to clusterApp/3psw/lpng1634/scripts/makefile.sgi
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.so9 b/clusterApp/3psw/lpng1634/scripts/makefile.so9
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.so9
rename to clusterApp/3psw/lpng1634/scripts/makefile.so9
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.solaris b/clusterApp/3psw/lpng1634/scripts/makefile.solaris
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.solaris
rename to clusterApp/3psw/lpng1634/scripts/makefile.solaris
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.solaris-x86 b/clusterApp/3psw/lpng1634/scripts/makefile.solaris-x86
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.solaris-x86
rename to clusterApp/3psw/lpng1634/scripts/makefile.solaris-x86
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.std b/clusterApp/3psw/lpng1634/scripts/makefile.std
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.std
rename to clusterApp/3psw/lpng1634/scripts/makefile.std
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.sunos b/clusterApp/3psw/lpng1634/scripts/makefile.sunos
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.sunos
rename to clusterApp/3psw/lpng1634/scripts/makefile.sunos
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.tc3 b/clusterApp/3psw/lpng1634/scripts/makefile.tc3
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.tc3
rename to clusterApp/3psw/lpng1634/scripts/makefile.tc3
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.vcwin32 b/clusterApp/3psw/lpng1634/scripts/makefile.vcwin32
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makefile.vcwin32
rename to clusterApp/3psw/lpng1634/scripts/makefile.vcwin32
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makevms.com b/clusterApp/3psw/lpng1634/scripts/makevms.com
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/makevms.com
rename to clusterApp/3psw/lpng1634/scripts/makevms.com
diff --git a/insDavi2.0/3psw/lpng1634/scripts/options.awk b/clusterApp/3psw/lpng1634/scripts/options.awk
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/options.awk
rename to clusterApp/3psw/lpng1634/scripts/options.awk
diff --git a/insDavi2.0/3psw/lpng1634/scripts/pnglibconf.dfa b/clusterApp/3psw/lpng1634/scripts/pnglibconf.dfa
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/pnglibconf.dfa
rename to clusterApp/3psw/lpng1634/scripts/pnglibconf.dfa
diff --git a/insDavi2.0/3psw/lpng1634/scripts/pnglibconf.h.prebuilt b/clusterApp/3psw/lpng1634/scripts/pnglibconf.h.prebuilt
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/pnglibconf.h.prebuilt
rename to clusterApp/3psw/lpng1634/scripts/pnglibconf.h.prebuilt
diff --git a/insDavi2.0/3psw/lpng1634/scripts/pnglibconf.mak b/clusterApp/3psw/lpng1634/scripts/pnglibconf.mak
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/pnglibconf.mak
rename to clusterApp/3psw/lpng1634/scripts/pnglibconf.mak
diff --git a/insDavi2.0/3psw/lpng1634/scripts/pngwin.rc b/clusterApp/3psw/lpng1634/scripts/pngwin.rc
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/pngwin.rc
rename to clusterApp/3psw/lpng1634/scripts/pngwin.rc
diff --git a/insDavi2.0/3psw/lpng1634/scripts/prefix.c b/clusterApp/3psw/lpng1634/scripts/prefix.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/prefix.c
rename to clusterApp/3psw/lpng1634/scripts/prefix.c
diff --git a/insDavi2.0/3psw/lpng1634/scripts/smakefile.ppc b/clusterApp/3psw/lpng1634/scripts/smakefile.ppc
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/smakefile.ppc
rename to clusterApp/3psw/lpng1634/scripts/smakefile.ppc
diff --git a/insDavi2.0/3psw/lpng1634/scripts/sym.c b/clusterApp/3psw/lpng1634/scripts/sym.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/sym.c
rename to clusterApp/3psw/lpng1634/scripts/sym.c
diff --git a/insDavi2.0/3psw/lpng1634/scripts/symbols.c b/clusterApp/3psw/lpng1634/scripts/symbols.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/symbols.c
rename to clusterApp/3psw/lpng1634/scripts/symbols.c
diff --git a/insDavi2.0/3psw/lpng1634/scripts/symbols.def b/clusterApp/3psw/lpng1634/scripts/symbols.def
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/symbols.def
rename to clusterApp/3psw/lpng1634/scripts/symbols.def
diff --git a/insDavi2.0/3psw/lpng1634/scripts/test.cmake.in b/clusterApp/3psw/lpng1634/scripts/test.cmake.in
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/test.cmake.in
rename to clusterApp/3psw/lpng1634/scripts/test.cmake.in
diff --git a/insDavi2.0/3psw/lpng1634/scripts/vers.c b/clusterApp/3psw/lpng1634/scripts/vers.c
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/scripts/vers.c
rename to clusterApp/3psw/lpng1634/scripts/vers.c
diff --git a/insDavi2.0/3psw/lpng1634/zconf.h b/clusterApp/3psw/lpng1634/zconf.h
similarity index 100%
rename from insDavi2.0/3psw/lpng1634/zconf.h
rename to clusterApp/3psw/lpng1634/zconf.h
diff --git a/insDavi2.0/3psw/zlib-1.2.11/CMakeLists.txt b/clusterApp/3psw/zlib-1.2.11/CMakeLists.txt
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/CMakeLists.txt
rename to clusterApp/3psw/zlib-1.2.11/CMakeLists.txt
diff --git a/insDavi2.0/3psw/zlib-1.2.11/ChangeLog b/clusterApp/3psw/zlib-1.2.11/ChangeLog
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/ChangeLog
rename to clusterApp/3psw/zlib-1.2.11/ChangeLog
diff --git a/insDavi2.0/3psw/zlib-1.2.11/FAQ b/clusterApp/3psw/zlib-1.2.11/FAQ
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/FAQ
rename to clusterApp/3psw/zlib-1.2.11/FAQ
diff --git a/insDavi2.0/3psw/zlib-1.2.11/INDEX b/clusterApp/3psw/zlib-1.2.11/INDEX
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/INDEX
rename to clusterApp/3psw/zlib-1.2.11/INDEX
diff --git a/insDavi2.0/3psw/zlib-1.2.11/Makefile b/clusterApp/3psw/zlib-1.2.11/Makefile
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/Makefile
rename to clusterApp/3psw/zlib-1.2.11/Makefile
diff --git a/insDavi2.0/3psw/zlib-1.2.11/Makefile.gcc b/clusterApp/3psw/zlib-1.2.11/Makefile.gcc
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/Makefile.gcc
rename to clusterApp/3psw/zlib-1.2.11/Makefile.gcc
diff --git a/insDavi2.0/3psw/zlib-1.2.11/Makefile.in b/clusterApp/3psw/zlib-1.2.11/Makefile.in
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/Makefile.in
rename to clusterApp/3psw/zlib-1.2.11/Makefile.in
diff --git a/insDavi2.0/3psw/zlib-1.2.11/README b/clusterApp/3psw/zlib-1.2.11/README
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/README
rename to clusterApp/3psw/zlib-1.2.11/README
diff --git a/insDavi2.0/3psw/zlib-1.2.11/adler32.c b/clusterApp/3psw/zlib-1.2.11/adler32.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/adler32.c
rename to clusterApp/3psw/zlib-1.2.11/adler32.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/amiga/Makefile.pup b/clusterApp/3psw/zlib-1.2.11/amiga/Makefile.pup
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/amiga/Makefile.pup
rename to clusterApp/3psw/zlib-1.2.11/amiga/Makefile.pup
diff --git a/insDavi2.0/3psw/zlib-1.2.11/amiga/Makefile.sas b/clusterApp/3psw/zlib-1.2.11/amiga/Makefile.sas
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/amiga/Makefile.sas
rename to clusterApp/3psw/zlib-1.2.11/amiga/Makefile.sas
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeCache.txt b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeCache.txt
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeCache.txt
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeCache.txt
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/3.10.2/CMakeCCompiler.cmake b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/3.10.2/CMakeCCompiler.cmake
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/3.10.2/CMakeCCompiler.cmake
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/3.10.2/CMakeCCompiler.cmake
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/3.10.2/CMakeDetermineCompilerABI_C.bin b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/3.10.2/CMakeDetermineCompilerABI_C.bin
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/3.10.2/CMakeDetermineCompilerABI_C.bin
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/3.10.2/CMakeDetermineCompilerABI_C.bin
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/3.10.2/CMakeRCCompiler.cmake b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/3.10.2/CMakeRCCompiler.cmake
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/3.10.2/CMakeRCCompiler.cmake
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/3.10.2/CMakeRCCompiler.cmake
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/3.10.2/CMakeSystem.cmake b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/3.10.2/CMakeSystem.cmake
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/3.10.2/CMakeSystem.cmake
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/3.10.2/CMakeSystem.cmake
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/3.10.2/CompilerIdC/CMakeCCompilerId.c b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/3.10.2/CompilerIdC/CMakeCCompilerId.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/3.10.2/CompilerIdC/CMakeCCompilerId.c
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/3.10.2/CompilerIdC/CMakeCCompilerId.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/3.10.2/CompilerIdC/a.exe b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/3.10.2/CompilerIdC/a.exe
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/3.10.2/CompilerIdC/a.exe
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/3.10.2/CompilerIdC/a.exe
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/CMakeDirectoryInformation.cmake b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/CMakeDirectoryInformation.cmake
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/CMakeDirectoryInformation.cmake
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/CMakeDirectoryInformation.cmake
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/CMakeError.log b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/CMakeError.log
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/CMakeError.log
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/CMakeError.log
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/CMakeOutput.log b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/CMakeOutput.log
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/CMakeOutput.log
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/CMakeOutput.log
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/CMakeRuleHashes.txt b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/CMakeRuleHashes.txt
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/CMakeRuleHashes.txt
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/CMakeRuleHashes.txt
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/CheckTypeSize/OFF64_T.bin b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/CheckTypeSize/OFF64_T.bin
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/CheckTypeSize/OFF64_T.bin
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/CheckTypeSize/OFF64_T.bin
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/CheckTypeSize/OFF64_T.c b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/CheckTypeSize/OFF64_T.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/CheckTypeSize/OFF64_T.c
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/CheckTypeSize/OFF64_T.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/Makefile.cmake b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/Makefile.cmake
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/Makefile.cmake
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/Makefile.cmake
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/Makefile2 b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/Makefile2
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/Makefile2
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/Makefile2
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/TargetDirectories.txt b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/TargetDirectories.txt
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/TargetDirectories.txt
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/TargetDirectories.txt
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/cmake.check_cache b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/cmake.check_cache
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/cmake.check_cache
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/cmake.check_cache
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/C.includecache b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/C.includecache
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/C.includecache
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/C.includecache
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/DependInfo.cmake b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/DependInfo.cmake
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/DependInfo.cmake
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/DependInfo.cmake
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/build.make b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/build.make
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/build.make
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/build.make
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/cmake_clean.cmake b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/cmake_clean.cmake
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/cmake_clean.cmake
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/cmake_clean.cmake
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/depend.internal b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/depend.internal
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/depend.internal
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/depend.internal
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/depend.make b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/depend.make
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/depend.make
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/depend.make
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/flags.make b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/flags.make
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/flags.make
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/flags.make
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/includes_C.rsp b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/includes_C.rsp
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/includes_C.rsp
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/includes_C.rsp
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/link.txt b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/link.txt
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/link.txt
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/link.txt
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/linklibs.rsp b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/linklibs.rsp
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/linklibs.rsp
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/linklibs.rsp
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/objects.a b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/objects.a
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/objects.a
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/objects.a
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/objects1.rsp b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/objects1.rsp
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/objects1.rsp
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/objects1.rsp
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/progress.make b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/progress.make
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/progress.make
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/progress.make
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/test/example.obj b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/test/example.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/test/example.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example.dir/test/example.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/C.includecache b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/C.includecache
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/C.includecache
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/C.includecache
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/DependInfo.cmake b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/DependInfo.cmake
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/DependInfo.cmake
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/DependInfo.cmake
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/build.make b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/build.make
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/build.make
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/build.make
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/cmake_clean.cmake b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/cmake_clean.cmake
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/cmake_clean.cmake
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/cmake_clean.cmake
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/depend.internal b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/depend.internal
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/depend.internal
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/depend.internal
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/depend.make b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/depend.make
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/depend.make
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/depend.make
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/flags.make b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/flags.make
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/flags.make
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/flags.make
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/includes_C.rsp b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/includes_C.rsp
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/includes_C.rsp
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/includes_C.rsp
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/link.txt b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/link.txt
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/link.txt
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/link.txt
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/linklibs.rsp b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/linklibs.rsp
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/linklibs.rsp
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/linklibs.rsp
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/objects.a b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/objects.a
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/objects.a
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/objects.a
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/objects1.rsp b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/objects1.rsp
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/objects1.rsp
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/objects1.rsp
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/progress.make b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/progress.make
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/progress.make
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/progress.make
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/test/example.obj b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/test/example.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/test/example.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/example64.dir/test/example.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/feature_tests.bin b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/feature_tests.bin
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/feature_tests.bin
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/feature_tests.bin
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/feature_tests.c b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/feature_tests.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/feature_tests.c
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/feature_tests.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/C.includecache b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/C.includecache
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/C.includecache
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/C.includecache
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/DependInfo.cmake b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/DependInfo.cmake
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/DependInfo.cmake
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/DependInfo.cmake
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/build.make b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/build.make
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/build.make
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/build.make
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/cmake_clean.cmake b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/cmake_clean.cmake
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/cmake_clean.cmake
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/cmake_clean.cmake
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/depend.internal b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/depend.internal
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/depend.internal
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/depend.internal
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/depend.make b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/depend.make
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/depend.make
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/depend.make
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/flags.make b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/flags.make
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/flags.make
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/flags.make
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/includes_C.rsp b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/includes_C.rsp
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/includes_C.rsp
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/includes_C.rsp
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/link.txt b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/link.txt
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/link.txt
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/link.txt
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/linklibs.rsp b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/linklibs.rsp
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/linklibs.rsp
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/linklibs.rsp
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/objects.a b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/objects.a
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/objects.a
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/objects.a
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/objects1.rsp b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/objects1.rsp
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/objects1.rsp
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/objects1.rsp
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/progress.make b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/progress.make
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/progress.make
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/progress.make
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/test/minigzip.obj b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/test/minigzip.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/test/minigzip.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip.dir/test/minigzip.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/C.includecache b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/C.includecache
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/C.includecache
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/C.includecache
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/DependInfo.cmake b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/DependInfo.cmake
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/DependInfo.cmake
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/DependInfo.cmake
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/build.make b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/build.make
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/build.make
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/build.make
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/cmake_clean.cmake b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/cmake_clean.cmake
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/cmake_clean.cmake
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/cmake_clean.cmake
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/depend.internal b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/depend.internal
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/depend.internal
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/depend.internal
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/depend.make b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/depend.make
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/depend.make
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/depend.make
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/flags.make b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/flags.make
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/flags.make
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/flags.make
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/includes_C.rsp b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/includes_C.rsp
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/includes_C.rsp
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/includes_C.rsp
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/link.txt b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/link.txt
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/link.txt
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/link.txt
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/linklibs.rsp b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/linklibs.rsp
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/linklibs.rsp
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/linklibs.rsp
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/objects.a b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/objects.a
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/objects.a
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/objects.a
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/objects1.rsp b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/objects1.rsp
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/objects1.rsp
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/objects1.rsp
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/progress.make b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/progress.make
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/progress.make
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/progress.make
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/test/minigzip.obj b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/test/minigzip.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/test/minigzip.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/minigzip64.dir/test/minigzip.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/progress.marks b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/progress.marks
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/progress.marks
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/progress.marks
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/C.includecache b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/C.includecache
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/C.includecache
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/C.includecache
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/DependInfo.cmake b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/DependInfo.cmake
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/DependInfo.cmake
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/DependInfo.cmake
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/adler32.obj b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/adler32.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/adler32.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/adler32.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/build.make b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/build.make
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/build.make
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/build.make
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/cmake_clean.cmake b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/cmake_clean.cmake
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/cmake_clean.cmake
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/cmake_clean.cmake
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/compress.obj b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/compress.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/compress.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/compress.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/crc32.obj b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/crc32.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/crc32.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/crc32.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/deflate.obj b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/deflate.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/deflate.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/deflate.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/depend.internal b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/depend.internal
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/depend.internal
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/depend.internal
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/depend.make b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/depend.make
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/depend.make
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/depend.make
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/flags.make b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/flags.make
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/flags.make
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/flags.make
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/gzclose.obj b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/gzclose.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/gzclose.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/gzclose.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/gzlib.obj b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/gzlib.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/gzlib.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/gzlib.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/gzread.obj b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/gzread.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/gzread.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/gzread.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/gzwrite.obj b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/gzwrite.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/gzwrite.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/gzwrite.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/includes_C.rsp b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/includes_C.rsp
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/includes_C.rsp
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/includes_C.rsp
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/infback.obj b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/infback.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/infback.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/infback.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/inffast.obj b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/inffast.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/inffast.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/inffast.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/inflate.obj b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/inflate.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/inflate.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/inflate.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/inftrees.obj b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/inftrees.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/inftrees.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/inftrees.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/link.txt b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/link.txt
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/link.txt
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/link.txt
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/linklibs.rsp b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/linklibs.rsp
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/linklibs.rsp
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/linklibs.rsp
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/objects.a b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/objects.a
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/objects.a
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/objects.a
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/objects1.rsp b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/objects1.rsp
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/objects1.rsp
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/objects1.rsp
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/progress.make b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/progress.make
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/progress.make
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/progress.make
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/trees.obj b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/trees.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/trees.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/trees.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/uncompr.obj b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/uncompr.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/uncompr.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/uncompr.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/zutil.obj b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/zutil.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/zutil.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlib.dir/zutil.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/C.includecache b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/C.includecache
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/C.includecache
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/C.includecache
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/DependInfo.cmake b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/DependInfo.cmake
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/DependInfo.cmake
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/DependInfo.cmake
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/adler32.obj b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/adler32.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/adler32.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/adler32.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/build.make b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/build.make
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/build.make
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/build.make
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/cmake_clean.cmake b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/cmake_clean.cmake
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/cmake_clean.cmake
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/cmake_clean.cmake
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/cmake_clean_target.cmake b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/cmake_clean_target.cmake
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/cmake_clean_target.cmake
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/cmake_clean_target.cmake
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/compress.obj b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/compress.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/compress.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/compress.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/crc32.obj b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/crc32.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/crc32.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/crc32.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/deflate.obj b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/deflate.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/deflate.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/deflate.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/depend.internal b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/depend.internal
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/depend.internal
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/depend.internal
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/depend.make b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/depend.make
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/depend.make
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/depend.make
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/flags.make b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/flags.make
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/flags.make
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/flags.make
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/gzclose.obj b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/gzclose.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/gzclose.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/gzclose.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/gzlib.obj b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/gzlib.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/gzlib.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/gzlib.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/gzread.obj b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/gzread.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/gzread.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/gzread.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/gzwrite.obj b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/gzwrite.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/gzwrite.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/gzwrite.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/includes_C.rsp b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/includes_C.rsp
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/includes_C.rsp
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/includes_C.rsp
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/infback.obj b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/infback.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/infback.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/infback.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/inffast.obj b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/inffast.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/inffast.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/inffast.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/inflate.obj b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/inflate.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/inflate.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/inflate.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/inftrees.obj b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/inftrees.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/inftrees.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/inftrees.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/link.txt b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/link.txt
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/link.txt
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/link.txt
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/progress.make b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/progress.make
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/progress.make
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/progress.make
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/trees.obj b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/trees.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/trees.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/trees.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/uncompr.obj b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/uncompr.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/uncompr.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/uncompr.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/zutil.obj b/clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/zutil.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/zutil.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/CMakeFiles/zlibstatic.dir/zutil.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/CTestTestfile.cmake b/clusterApp/3psw/zlib-1.2.11/build_win/CTestTestfile.cmake
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/CTestTestfile.cmake
rename to clusterApp/3psw/zlib-1.2.11/build_win/CTestTestfile.cmake
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/Makefile b/clusterApp/3psw/zlib-1.2.11/build_win/Makefile
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/Makefile
rename to clusterApp/3psw/zlib-1.2.11/build_win/Makefile
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/cmake_install.cmake b/clusterApp/3psw/zlib-1.2.11/build_win/cmake_install.cmake
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/cmake_install.cmake
rename to clusterApp/3psw/zlib-1.2.11/build_win/cmake_install.cmake
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/example.exe b/clusterApp/3psw/zlib-1.2.11/build_win/example.exe
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/example.exe
rename to clusterApp/3psw/zlib-1.2.11/build_win/example.exe
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/example64.exe b/clusterApp/3psw/zlib-1.2.11/build_win/example64.exe
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/example64.exe
rename to clusterApp/3psw/zlib-1.2.11/build_win/example64.exe
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/libzlib.dll b/clusterApp/3psw/zlib-1.2.11/build_win/libzlib.dll
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/libzlib.dll
rename to clusterApp/3psw/zlib-1.2.11/build_win/libzlib.dll
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/libzlib.dll.a b/clusterApp/3psw/zlib-1.2.11/build_win/libzlib.dll.a
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/libzlib.dll.a
rename to clusterApp/3psw/zlib-1.2.11/build_win/libzlib.dll.a
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/libzlibstatic.a b/clusterApp/3psw/zlib-1.2.11/build_win/libzlibstatic.a
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/libzlibstatic.a
rename to clusterApp/3psw/zlib-1.2.11/build_win/libzlibstatic.a
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/minigzip.exe b/clusterApp/3psw/zlib-1.2.11/build_win/minigzip.exe
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/minigzip.exe
rename to clusterApp/3psw/zlib-1.2.11/build_win/minigzip.exe
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/minigzip64.exe b/clusterApp/3psw/zlib-1.2.11/build_win/minigzip64.exe
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/minigzip64.exe
rename to clusterApp/3psw/zlib-1.2.11/build_win/minigzip64.exe
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/zconf.h b/clusterApp/3psw/zlib-1.2.11/build_win/zconf.h
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/zconf.h
rename to clusterApp/3psw/zlib-1.2.11/build_win/zconf.h
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/zlib.cbp b/clusterApp/3psw/zlib-1.2.11/build_win/zlib.cbp
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/zlib.cbp
rename to clusterApp/3psw/zlib-1.2.11/build_win/zlib.cbp
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/zlib.layout b/clusterApp/3psw/zlib-1.2.11/build_win/zlib.layout
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/zlib.layout
rename to clusterApp/3psw/zlib-1.2.11/build_win/zlib.layout
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/zlib.pc b/clusterApp/3psw/zlib-1.2.11/build_win/zlib.pc
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/zlib.pc
rename to clusterApp/3psw/zlib-1.2.11/build_win/zlib.pc
diff --git a/insDavi2.0/3psw/zlib-1.2.11/build_win/zlib1rc.obj b/clusterApp/3psw/zlib-1.2.11/build_win/zlib1rc.obj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/build_win/zlib1rc.obj
rename to clusterApp/3psw/zlib-1.2.11/build_win/zlib1rc.obj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/compress.c b/clusterApp/3psw/zlib-1.2.11/compress.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/compress.c
rename to clusterApp/3psw/zlib-1.2.11/compress.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/configure b/clusterApp/3psw/zlib-1.2.11/configure
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/configure
rename to clusterApp/3psw/zlib-1.2.11/configure
diff --git a/insDavi2.0/3psw/zlib-1.2.11/configure.log b/clusterApp/3psw/zlib-1.2.11/configure.log
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/configure.log
rename to clusterApp/3psw/zlib-1.2.11/configure.log
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/README.contrib b/clusterApp/3psw/zlib-1.2.11/contrib/README.contrib
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/README.contrib
rename to clusterApp/3psw/zlib-1.2.11/contrib/README.contrib
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/ada/buffer_demo.adb b/clusterApp/3psw/zlib-1.2.11/contrib/ada/buffer_demo.adb
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/ada/buffer_demo.adb
rename to clusterApp/3psw/zlib-1.2.11/contrib/ada/buffer_demo.adb
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/ada/mtest.adb b/clusterApp/3psw/zlib-1.2.11/contrib/ada/mtest.adb
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/ada/mtest.adb
rename to clusterApp/3psw/zlib-1.2.11/contrib/ada/mtest.adb
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/ada/read.adb b/clusterApp/3psw/zlib-1.2.11/contrib/ada/read.adb
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/ada/read.adb
rename to clusterApp/3psw/zlib-1.2.11/contrib/ada/read.adb
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/ada/readme.txt b/clusterApp/3psw/zlib-1.2.11/contrib/ada/readme.txt
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/ada/readme.txt
rename to clusterApp/3psw/zlib-1.2.11/contrib/ada/readme.txt
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/ada/test.adb b/clusterApp/3psw/zlib-1.2.11/contrib/ada/test.adb
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/ada/test.adb
rename to clusterApp/3psw/zlib-1.2.11/contrib/ada/test.adb
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/ada/zlib-streams.adb b/clusterApp/3psw/zlib-1.2.11/contrib/ada/zlib-streams.adb
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/ada/zlib-streams.adb
rename to clusterApp/3psw/zlib-1.2.11/contrib/ada/zlib-streams.adb
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/ada/zlib-streams.ads b/clusterApp/3psw/zlib-1.2.11/contrib/ada/zlib-streams.ads
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/ada/zlib-streams.ads
rename to clusterApp/3psw/zlib-1.2.11/contrib/ada/zlib-streams.ads
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/ada/zlib-thin.adb b/clusterApp/3psw/zlib-1.2.11/contrib/ada/zlib-thin.adb
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/ada/zlib-thin.adb
rename to clusterApp/3psw/zlib-1.2.11/contrib/ada/zlib-thin.adb
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/ada/zlib-thin.ads b/clusterApp/3psw/zlib-1.2.11/contrib/ada/zlib-thin.ads
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/ada/zlib-thin.ads
rename to clusterApp/3psw/zlib-1.2.11/contrib/ada/zlib-thin.ads
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/ada/zlib.adb b/clusterApp/3psw/zlib-1.2.11/contrib/ada/zlib.adb
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/ada/zlib.adb
rename to clusterApp/3psw/zlib-1.2.11/contrib/ada/zlib.adb
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/ada/zlib.ads b/clusterApp/3psw/zlib-1.2.11/contrib/ada/zlib.ads
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/ada/zlib.ads
rename to clusterApp/3psw/zlib-1.2.11/contrib/ada/zlib.ads
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/ada/zlib.gpr b/clusterApp/3psw/zlib-1.2.11/contrib/ada/zlib.gpr
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/ada/zlib.gpr
rename to clusterApp/3psw/zlib-1.2.11/contrib/ada/zlib.gpr
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/amd64/amd64-match.S b/clusterApp/3psw/zlib-1.2.11/contrib/amd64/amd64-match.S
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/amd64/amd64-match.S
rename to clusterApp/3psw/zlib-1.2.11/contrib/amd64/amd64-match.S
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/asm686/README.686 b/clusterApp/3psw/zlib-1.2.11/contrib/asm686/README.686
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/asm686/README.686
rename to clusterApp/3psw/zlib-1.2.11/contrib/asm686/README.686
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/asm686/match.S b/clusterApp/3psw/zlib-1.2.11/contrib/asm686/match.S
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/asm686/match.S
rename to clusterApp/3psw/zlib-1.2.11/contrib/asm686/match.S
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/blast/Makefile b/clusterApp/3psw/zlib-1.2.11/contrib/blast/Makefile
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/blast/Makefile
rename to clusterApp/3psw/zlib-1.2.11/contrib/blast/Makefile
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/blast/README b/clusterApp/3psw/zlib-1.2.11/contrib/blast/README
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/blast/README
rename to clusterApp/3psw/zlib-1.2.11/contrib/blast/README
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/blast/blast.c b/clusterApp/3psw/zlib-1.2.11/contrib/blast/blast.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/blast/blast.c
rename to clusterApp/3psw/zlib-1.2.11/contrib/blast/blast.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/blast/blast.h b/clusterApp/3psw/zlib-1.2.11/contrib/blast/blast.h
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/blast/blast.h
rename to clusterApp/3psw/zlib-1.2.11/contrib/blast/blast.h
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/blast/test.pk b/clusterApp/3psw/zlib-1.2.11/contrib/blast/test.pk
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/blast/test.pk
rename to clusterApp/3psw/zlib-1.2.11/contrib/blast/test.pk
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/blast/test.txt b/clusterApp/3psw/zlib-1.2.11/contrib/blast/test.txt
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/blast/test.txt
rename to clusterApp/3psw/zlib-1.2.11/contrib/blast/test.txt
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/delphi/ZLib.pas b/clusterApp/3psw/zlib-1.2.11/contrib/delphi/ZLib.pas
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/delphi/ZLib.pas
rename to clusterApp/3psw/zlib-1.2.11/contrib/delphi/ZLib.pas
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/delphi/ZLibConst.pas b/clusterApp/3psw/zlib-1.2.11/contrib/delphi/ZLibConst.pas
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/delphi/ZLibConst.pas
rename to clusterApp/3psw/zlib-1.2.11/contrib/delphi/ZLibConst.pas
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/delphi/readme.txt b/clusterApp/3psw/zlib-1.2.11/contrib/delphi/readme.txt
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/delphi/readme.txt
rename to clusterApp/3psw/zlib-1.2.11/contrib/delphi/readme.txt
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/delphi/zlibd32.mak b/clusterApp/3psw/zlib-1.2.11/contrib/delphi/zlibd32.mak
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/delphi/zlibd32.mak
rename to clusterApp/3psw/zlib-1.2.11/contrib/delphi/zlibd32.mak
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib.build b/clusterApp/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib.build
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib.build
rename to clusterApp/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib.build
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib.chm b/clusterApp/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib.chm
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib.chm
rename to clusterApp/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib.chm
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib.sln b/clusterApp/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib.sln
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib.sln
rename to clusterApp/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib.sln
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/AssemblyInfo.cs b/clusterApp/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/AssemblyInfo.cs
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/AssemblyInfo.cs
rename to clusterApp/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/AssemblyInfo.cs
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/ChecksumImpl.cs b/clusterApp/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/ChecksumImpl.cs
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/ChecksumImpl.cs
rename to clusterApp/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/ChecksumImpl.cs
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/CircularBuffer.cs b/clusterApp/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/CircularBuffer.cs
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/CircularBuffer.cs
rename to clusterApp/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/CircularBuffer.cs
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/CodecBase.cs b/clusterApp/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/CodecBase.cs
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/CodecBase.cs
rename to clusterApp/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/CodecBase.cs
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/Deflater.cs b/clusterApp/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/Deflater.cs
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/Deflater.cs
rename to clusterApp/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/Deflater.cs
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/DotZLib.cs b/clusterApp/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/DotZLib.cs
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/DotZLib.cs
rename to clusterApp/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/DotZLib.cs
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/DotZLib.csproj b/clusterApp/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/DotZLib.csproj
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/DotZLib.csproj
rename to clusterApp/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/DotZLib.csproj
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/GZipStream.cs b/clusterApp/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/GZipStream.cs
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/GZipStream.cs
rename to clusterApp/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/GZipStream.cs
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/Inflater.cs b/clusterApp/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/Inflater.cs
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/Inflater.cs
rename to clusterApp/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/Inflater.cs
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/UnitTests.cs b/clusterApp/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/UnitTests.cs
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/UnitTests.cs
rename to clusterApp/3psw/zlib-1.2.11/contrib/dotzlib/DotZLib/UnitTests.cs
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/dotzlib/LICENSE_1_0.txt b/clusterApp/3psw/zlib-1.2.11/contrib/dotzlib/LICENSE_1_0.txt
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/dotzlib/LICENSE_1_0.txt
rename to clusterApp/3psw/zlib-1.2.11/contrib/dotzlib/LICENSE_1_0.txt
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/dotzlib/readme.txt b/clusterApp/3psw/zlib-1.2.11/contrib/dotzlib/readme.txt
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/dotzlib/readme.txt
rename to clusterApp/3psw/zlib-1.2.11/contrib/dotzlib/readme.txt
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/gcc_gvmat64/gvmat64.S b/clusterApp/3psw/zlib-1.2.11/contrib/gcc_gvmat64/gvmat64.S
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/gcc_gvmat64/gvmat64.S
rename to clusterApp/3psw/zlib-1.2.11/contrib/gcc_gvmat64/gvmat64.S
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/infback9/README b/clusterApp/3psw/zlib-1.2.11/contrib/infback9/README
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/infback9/README
rename to clusterApp/3psw/zlib-1.2.11/contrib/infback9/README
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/infback9/infback9.c b/clusterApp/3psw/zlib-1.2.11/contrib/infback9/infback9.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/infback9/infback9.c
rename to clusterApp/3psw/zlib-1.2.11/contrib/infback9/infback9.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/infback9/infback9.h b/clusterApp/3psw/zlib-1.2.11/contrib/infback9/infback9.h
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/infback9/infback9.h
rename to clusterApp/3psw/zlib-1.2.11/contrib/infback9/infback9.h
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/infback9/inffix9.h b/clusterApp/3psw/zlib-1.2.11/contrib/infback9/inffix9.h
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/infback9/inffix9.h
rename to clusterApp/3psw/zlib-1.2.11/contrib/infback9/inffix9.h
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/infback9/inflate9.h b/clusterApp/3psw/zlib-1.2.11/contrib/infback9/inflate9.h
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/infback9/inflate9.h
rename to clusterApp/3psw/zlib-1.2.11/contrib/infback9/inflate9.h
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/infback9/inftree9.c b/clusterApp/3psw/zlib-1.2.11/contrib/infback9/inftree9.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/infback9/inftree9.c
rename to clusterApp/3psw/zlib-1.2.11/contrib/infback9/inftree9.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/infback9/inftree9.h b/clusterApp/3psw/zlib-1.2.11/contrib/infback9/inftree9.h
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/infback9/inftree9.h
rename to clusterApp/3psw/zlib-1.2.11/contrib/infback9/inftree9.h
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/inflate86/inffas86.c b/clusterApp/3psw/zlib-1.2.11/contrib/inflate86/inffas86.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/inflate86/inffas86.c
rename to clusterApp/3psw/zlib-1.2.11/contrib/inflate86/inffas86.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/inflate86/inffast.S b/clusterApp/3psw/zlib-1.2.11/contrib/inflate86/inffast.S
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/inflate86/inffast.S
rename to clusterApp/3psw/zlib-1.2.11/contrib/inflate86/inffast.S
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/iostream/test.cpp b/clusterApp/3psw/zlib-1.2.11/contrib/iostream/test.cpp
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/iostream/test.cpp
rename to clusterApp/3psw/zlib-1.2.11/contrib/iostream/test.cpp
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/iostream/zfstream.cpp b/clusterApp/3psw/zlib-1.2.11/contrib/iostream/zfstream.cpp
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/iostream/zfstream.cpp
rename to clusterApp/3psw/zlib-1.2.11/contrib/iostream/zfstream.cpp
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/iostream/zfstream.h b/clusterApp/3psw/zlib-1.2.11/contrib/iostream/zfstream.h
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/iostream/zfstream.h
rename to clusterApp/3psw/zlib-1.2.11/contrib/iostream/zfstream.h
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/iostream2/zstream.h b/clusterApp/3psw/zlib-1.2.11/contrib/iostream2/zstream.h
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/iostream2/zstream.h
rename to clusterApp/3psw/zlib-1.2.11/contrib/iostream2/zstream.h
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/iostream2/zstream_test.cpp b/clusterApp/3psw/zlib-1.2.11/contrib/iostream2/zstream_test.cpp
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/iostream2/zstream_test.cpp
rename to clusterApp/3psw/zlib-1.2.11/contrib/iostream2/zstream_test.cpp
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/iostream3/README b/clusterApp/3psw/zlib-1.2.11/contrib/iostream3/README
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/iostream3/README
rename to clusterApp/3psw/zlib-1.2.11/contrib/iostream3/README
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/iostream3/test.cc b/clusterApp/3psw/zlib-1.2.11/contrib/iostream3/test.cc
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/iostream3/test.cc
rename to clusterApp/3psw/zlib-1.2.11/contrib/iostream3/test.cc
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/iostream3/zfstream.cc b/clusterApp/3psw/zlib-1.2.11/contrib/iostream3/zfstream.cc
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/iostream3/zfstream.cc
rename to clusterApp/3psw/zlib-1.2.11/contrib/iostream3/zfstream.cc
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/iostream3/zfstream.h b/clusterApp/3psw/zlib-1.2.11/contrib/iostream3/zfstream.h
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/iostream3/zfstream.h
rename to clusterApp/3psw/zlib-1.2.11/contrib/iostream3/zfstream.h
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/masmx64/bld_ml64.bat b/clusterApp/3psw/zlib-1.2.11/contrib/masmx64/bld_ml64.bat
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/masmx64/bld_ml64.bat
rename to clusterApp/3psw/zlib-1.2.11/contrib/masmx64/bld_ml64.bat
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/masmx64/gvmat64.asm b/clusterApp/3psw/zlib-1.2.11/contrib/masmx64/gvmat64.asm
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/masmx64/gvmat64.asm
rename to clusterApp/3psw/zlib-1.2.11/contrib/masmx64/gvmat64.asm
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/masmx64/inffas8664.c b/clusterApp/3psw/zlib-1.2.11/contrib/masmx64/inffas8664.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/masmx64/inffas8664.c
rename to clusterApp/3psw/zlib-1.2.11/contrib/masmx64/inffas8664.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/masmx64/inffasx64.asm b/clusterApp/3psw/zlib-1.2.11/contrib/masmx64/inffasx64.asm
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/masmx64/inffasx64.asm
rename to clusterApp/3psw/zlib-1.2.11/contrib/masmx64/inffasx64.asm
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/masmx64/readme.txt b/clusterApp/3psw/zlib-1.2.11/contrib/masmx64/readme.txt
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/masmx64/readme.txt
rename to clusterApp/3psw/zlib-1.2.11/contrib/masmx64/readme.txt
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/masmx86/bld_ml32.bat b/clusterApp/3psw/zlib-1.2.11/contrib/masmx86/bld_ml32.bat
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/masmx86/bld_ml32.bat
rename to clusterApp/3psw/zlib-1.2.11/contrib/masmx86/bld_ml32.bat
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/masmx86/inffas32.asm b/clusterApp/3psw/zlib-1.2.11/contrib/masmx86/inffas32.asm
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/masmx86/inffas32.asm
rename to clusterApp/3psw/zlib-1.2.11/contrib/masmx86/inffas32.asm
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/masmx86/match686.asm b/clusterApp/3psw/zlib-1.2.11/contrib/masmx86/match686.asm
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/masmx86/match686.asm
rename to clusterApp/3psw/zlib-1.2.11/contrib/masmx86/match686.asm
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/masmx86/readme.txt b/clusterApp/3psw/zlib-1.2.11/contrib/masmx86/readme.txt
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/masmx86/readme.txt
rename to clusterApp/3psw/zlib-1.2.11/contrib/masmx86/readme.txt
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/Makefile b/clusterApp/3psw/zlib-1.2.11/contrib/minizip/Makefile
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/Makefile
rename to clusterApp/3psw/zlib-1.2.11/contrib/minizip/Makefile
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/Makefile.am b/clusterApp/3psw/zlib-1.2.11/contrib/minizip/Makefile.am
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/Makefile.am
rename to clusterApp/3psw/zlib-1.2.11/contrib/minizip/Makefile.am
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/MiniZip64_Changes.txt b/clusterApp/3psw/zlib-1.2.11/contrib/minizip/MiniZip64_Changes.txt
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/MiniZip64_Changes.txt
rename to clusterApp/3psw/zlib-1.2.11/contrib/minizip/MiniZip64_Changes.txt
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/MiniZip64_info.txt b/clusterApp/3psw/zlib-1.2.11/contrib/minizip/MiniZip64_info.txt
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/MiniZip64_info.txt
rename to clusterApp/3psw/zlib-1.2.11/contrib/minizip/MiniZip64_info.txt
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/configure.ac b/clusterApp/3psw/zlib-1.2.11/contrib/minizip/configure.ac
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/configure.ac
rename to clusterApp/3psw/zlib-1.2.11/contrib/minizip/configure.ac
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/crypt.h b/clusterApp/3psw/zlib-1.2.11/contrib/minizip/crypt.h
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/crypt.h
rename to clusterApp/3psw/zlib-1.2.11/contrib/minizip/crypt.h
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/ioapi.c b/clusterApp/3psw/zlib-1.2.11/contrib/minizip/ioapi.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/ioapi.c
rename to clusterApp/3psw/zlib-1.2.11/contrib/minizip/ioapi.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/ioapi.h b/clusterApp/3psw/zlib-1.2.11/contrib/minizip/ioapi.h
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/ioapi.h
rename to clusterApp/3psw/zlib-1.2.11/contrib/minizip/ioapi.h
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/iowin32.c b/clusterApp/3psw/zlib-1.2.11/contrib/minizip/iowin32.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/iowin32.c
rename to clusterApp/3psw/zlib-1.2.11/contrib/minizip/iowin32.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/iowin32.h b/clusterApp/3psw/zlib-1.2.11/contrib/minizip/iowin32.h
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/iowin32.h
rename to clusterApp/3psw/zlib-1.2.11/contrib/minizip/iowin32.h
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/make_vms.com b/clusterApp/3psw/zlib-1.2.11/contrib/minizip/make_vms.com
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/make_vms.com
rename to clusterApp/3psw/zlib-1.2.11/contrib/minizip/make_vms.com
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/miniunz.c b/clusterApp/3psw/zlib-1.2.11/contrib/minizip/miniunz.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/miniunz.c
rename to clusterApp/3psw/zlib-1.2.11/contrib/minizip/miniunz.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/miniunzip.1 b/clusterApp/3psw/zlib-1.2.11/contrib/minizip/miniunzip.1
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/miniunzip.1
rename to clusterApp/3psw/zlib-1.2.11/contrib/minizip/miniunzip.1
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/minizip.1 b/clusterApp/3psw/zlib-1.2.11/contrib/minizip/minizip.1
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/minizip.1
rename to clusterApp/3psw/zlib-1.2.11/contrib/minizip/minizip.1
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/minizip.c b/clusterApp/3psw/zlib-1.2.11/contrib/minizip/minizip.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/minizip.c
rename to clusterApp/3psw/zlib-1.2.11/contrib/minizip/minizip.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/minizip.pc.in b/clusterApp/3psw/zlib-1.2.11/contrib/minizip/minizip.pc.in
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/minizip.pc.in
rename to clusterApp/3psw/zlib-1.2.11/contrib/minizip/minizip.pc.in
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/mztools.c b/clusterApp/3psw/zlib-1.2.11/contrib/minizip/mztools.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/mztools.c
rename to clusterApp/3psw/zlib-1.2.11/contrib/minizip/mztools.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/mztools.h b/clusterApp/3psw/zlib-1.2.11/contrib/minizip/mztools.h
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/mztools.h
rename to clusterApp/3psw/zlib-1.2.11/contrib/minizip/mztools.h
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/unzip.c b/clusterApp/3psw/zlib-1.2.11/contrib/minizip/unzip.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/unzip.c
rename to clusterApp/3psw/zlib-1.2.11/contrib/minizip/unzip.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/unzip.h b/clusterApp/3psw/zlib-1.2.11/contrib/minizip/unzip.h
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/unzip.h
rename to clusterApp/3psw/zlib-1.2.11/contrib/minizip/unzip.h
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/zip.c b/clusterApp/3psw/zlib-1.2.11/contrib/minizip/zip.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/zip.c
rename to clusterApp/3psw/zlib-1.2.11/contrib/minizip/zip.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/zip.h b/clusterApp/3psw/zlib-1.2.11/contrib/minizip/zip.h
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/minizip/zip.h
rename to clusterApp/3psw/zlib-1.2.11/contrib/minizip/zip.h
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/pascal/example.pas b/clusterApp/3psw/zlib-1.2.11/contrib/pascal/example.pas
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/pascal/example.pas
rename to clusterApp/3psw/zlib-1.2.11/contrib/pascal/example.pas
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/pascal/readme.txt b/clusterApp/3psw/zlib-1.2.11/contrib/pascal/readme.txt
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/pascal/readme.txt
rename to clusterApp/3psw/zlib-1.2.11/contrib/pascal/readme.txt
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/pascal/zlibd32.mak b/clusterApp/3psw/zlib-1.2.11/contrib/pascal/zlibd32.mak
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/pascal/zlibd32.mak
rename to clusterApp/3psw/zlib-1.2.11/contrib/pascal/zlibd32.mak
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/pascal/zlibpas.pas b/clusterApp/3psw/zlib-1.2.11/contrib/pascal/zlibpas.pas
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/pascal/zlibpas.pas
rename to clusterApp/3psw/zlib-1.2.11/contrib/pascal/zlibpas.pas
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/puff/Makefile b/clusterApp/3psw/zlib-1.2.11/contrib/puff/Makefile
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/puff/Makefile
rename to clusterApp/3psw/zlib-1.2.11/contrib/puff/Makefile
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/puff/README b/clusterApp/3psw/zlib-1.2.11/contrib/puff/README
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/puff/README
rename to clusterApp/3psw/zlib-1.2.11/contrib/puff/README
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/puff/puff.c b/clusterApp/3psw/zlib-1.2.11/contrib/puff/puff.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/puff/puff.c
rename to clusterApp/3psw/zlib-1.2.11/contrib/puff/puff.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/puff/puff.h b/clusterApp/3psw/zlib-1.2.11/contrib/puff/puff.h
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/puff/puff.h
rename to clusterApp/3psw/zlib-1.2.11/contrib/puff/puff.h
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/puff/pufftest.c b/clusterApp/3psw/zlib-1.2.11/contrib/puff/pufftest.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/puff/pufftest.c
rename to clusterApp/3psw/zlib-1.2.11/contrib/puff/pufftest.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/puff/zeros.raw b/clusterApp/3psw/zlib-1.2.11/contrib/puff/zeros.raw
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/puff/zeros.raw
rename to clusterApp/3psw/zlib-1.2.11/contrib/puff/zeros.raw
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/testzlib/testzlib.c b/clusterApp/3psw/zlib-1.2.11/contrib/testzlib/testzlib.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/testzlib/testzlib.c
rename to clusterApp/3psw/zlib-1.2.11/contrib/testzlib/testzlib.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/testzlib/testzlib.txt b/clusterApp/3psw/zlib-1.2.11/contrib/testzlib/testzlib.txt
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/testzlib/testzlib.txt
rename to clusterApp/3psw/zlib-1.2.11/contrib/testzlib/testzlib.txt
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/untgz/Makefile b/clusterApp/3psw/zlib-1.2.11/contrib/untgz/Makefile
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/untgz/Makefile
rename to clusterApp/3psw/zlib-1.2.11/contrib/untgz/Makefile
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/untgz/Makefile.msc b/clusterApp/3psw/zlib-1.2.11/contrib/untgz/Makefile.msc
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/untgz/Makefile.msc
rename to clusterApp/3psw/zlib-1.2.11/contrib/untgz/Makefile.msc
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/untgz/untgz.c b/clusterApp/3psw/zlib-1.2.11/contrib/untgz/untgz.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/contrib/untgz/untgz.c
rename to clusterApp/3psw/zlib-1.2.11/contrib/untgz/untgz.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/crc32.c b/clusterApp/3psw/zlib-1.2.11/crc32.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/crc32.c
rename to clusterApp/3psw/zlib-1.2.11/crc32.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/crc32.h b/clusterApp/3psw/zlib-1.2.11/crc32.h
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/crc32.h
rename to clusterApp/3psw/zlib-1.2.11/crc32.h
diff --git a/insDavi2.0/3psw/zlib-1.2.11/deflate.c b/clusterApp/3psw/zlib-1.2.11/deflate.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/deflate.c
rename to clusterApp/3psw/zlib-1.2.11/deflate.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/deflate.h b/clusterApp/3psw/zlib-1.2.11/deflate.h
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/deflate.h
rename to clusterApp/3psw/zlib-1.2.11/deflate.h
diff --git a/insDavi2.0/3psw/zlib-1.2.11/doc/algorithm.txt b/clusterApp/3psw/zlib-1.2.11/doc/algorithm.txt
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/doc/algorithm.txt
rename to clusterApp/3psw/zlib-1.2.11/doc/algorithm.txt
diff --git a/insDavi2.0/3psw/zlib-1.2.11/doc/rfc1950.txt b/clusterApp/3psw/zlib-1.2.11/doc/rfc1950.txt
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/doc/rfc1950.txt
rename to clusterApp/3psw/zlib-1.2.11/doc/rfc1950.txt
diff --git a/insDavi2.0/3psw/zlib-1.2.11/doc/rfc1951.txt b/clusterApp/3psw/zlib-1.2.11/doc/rfc1951.txt
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/doc/rfc1951.txt
rename to clusterApp/3psw/zlib-1.2.11/doc/rfc1951.txt
diff --git a/insDavi2.0/3psw/zlib-1.2.11/doc/rfc1952.txt b/clusterApp/3psw/zlib-1.2.11/doc/rfc1952.txt
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/doc/rfc1952.txt
rename to clusterApp/3psw/zlib-1.2.11/doc/rfc1952.txt
diff --git a/insDavi2.0/3psw/zlib-1.2.11/doc/txtvsbin.txt b/clusterApp/3psw/zlib-1.2.11/doc/txtvsbin.txt
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/doc/txtvsbin.txt
rename to clusterApp/3psw/zlib-1.2.11/doc/txtvsbin.txt
diff --git a/insDavi2.0/3psw/zlib-1.2.11/example.exe b/clusterApp/3psw/zlib-1.2.11/example.exe
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/example.exe
rename to clusterApp/3psw/zlib-1.2.11/example.exe
diff --git a/insDavi2.0/3psw/zlib-1.2.11/example_d.exe b/clusterApp/3psw/zlib-1.2.11/example_d.exe
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/example_d.exe
rename to clusterApp/3psw/zlib-1.2.11/example_d.exe
diff --git a/insDavi2.0/3psw/zlib-1.2.11/examples/README.examples b/clusterApp/3psw/zlib-1.2.11/examples/README.examples
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/examples/README.examples
rename to clusterApp/3psw/zlib-1.2.11/examples/README.examples
diff --git a/insDavi2.0/3psw/zlib-1.2.11/examples/enough.c b/clusterApp/3psw/zlib-1.2.11/examples/enough.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/examples/enough.c
rename to clusterApp/3psw/zlib-1.2.11/examples/enough.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/examples/fitblk.c b/clusterApp/3psw/zlib-1.2.11/examples/fitblk.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/examples/fitblk.c
rename to clusterApp/3psw/zlib-1.2.11/examples/fitblk.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/examples/gun.c b/clusterApp/3psw/zlib-1.2.11/examples/gun.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/examples/gun.c
rename to clusterApp/3psw/zlib-1.2.11/examples/gun.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/examples/gzappend.c b/clusterApp/3psw/zlib-1.2.11/examples/gzappend.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/examples/gzappend.c
rename to clusterApp/3psw/zlib-1.2.11/examples/gzappend.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/examples/gzjoin.c b/clusterApp/3psw/zlib-1.2.11/examples/gzjoin.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/examples/gzjoin.c
rename to clusterApp/3psw/zlib-1.2.11/examples/gzjoin.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/examples/gzlog.c b/clusterApp/3psw/zlib-1.2.11/examples/gzlog.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/examples/gzlog.c
rename to clusterApp/3psw/zlib-1.2.11/examples/gzlog.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/examples/gzlog.h b/clusterApp/3psw/zlib-1.2.11/examples/gzlog.h
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/examples/gzlog.h
rename to clusterApp/3psw/zlib-1.2.11/examples/gzlog.h
diff --git a/insDavi2.0/3psw/zlib-1.2.11/examples/zlib_how.html b/clusterApp/3psw/zlib-1.2.11/examples/zlib_how.html
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/examples/zlib_how.html
rename to clusterApp/3psw/zlib-1.2.11/examples/zlib_how.html
diff --git a/insDavi2.0/3psw/zlib-1.2.11/examples/zpipe.c b/clusterApp/3psw/zlib-1.2.11/examples/zpipe.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/examples/zpipe.c
rename to clusterApp/3psw/zlib-1.2.11/examples/zpipe.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/examples/zran.c b/clusterApp/3psw/zlib-1.2.11/examples/zran.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/examples/zran.c
rename to clusterApp/3psw/zlib-1.2.11/examples/zran.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/gzclose.c b/clusterApp/3psw/zlib-1.2.11/gzclose.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/gzclose.c
rename to clusterApp/3psw/zlib-1.2.11/gzclose.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/gzguts.h b/clusterApp/3psw/zlib-1.2.11/gzguts.h
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/gzguts.h
rename to clusterApp/3psw/zlib-1.2.11/gzguts.h
diff --git a/insDavi2.0/3psw/zlib-1.2.11/gzlib.c b/clusterApp/3psw/zlib-1.2.11/gzlib.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/gzlib.c
rename to clusterApp/3psw/zlib-1.2.11/gzlib.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/gzread.c b/clusterApp/3psw/zlib-1.2.11/gzread.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/gzread.c
rename to clusterApp/3psw/zlib-1.2.11/gzread.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/gzwrite.c b/clusterApp/3psw/zlib-1.2.11/gzwrite.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/gzwrite.c
rename to clusterApp/3psw/zlib-1.2.11/gzwrite.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/infback.c b/clusterApp/3psw/zlib-1.2.11/infback.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/infback.c
rename to clusterApp/3psw/zlib-1.2.11/infback.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/inffast.c b/clusterApp/3psw/zlib-1.2.11/inffast.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/inffast.c
rename to clusterApp/3psw/zlib-1.2.11/inffast.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/inffast.h b/clusterApp/3psw/zlib-1.2.11/inffast.h
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/inffast.h
rename to clusterApp/3psw/zlib-1.2.11/inffast.h
diff --git a/insDavi2.0/3psw/zlib-1.2.11/inffixed.h b/clusterApp/3psw/zlib-1.2.11/inffixed.h
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/inffixed.h
rename to clusterApp/3psw/zlib-1.2.11/inffixed.h
diff --git a/insDavi2.0/3psw/zlib-1.2.11/inflate.c b/clusterApp/3psw/zlib-1.2.11/inflate.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/inflate.c
rename to clusterApp/3psw/zlib-1.2.11/inflate.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/inflate.h b/clusterApp/3psw/zlib-1.2.11/inflate.h
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/inflate.h
rename to clusterApp/3psw/zlib-1.2.11/inflate.h
diff --git a/insDavi2.0/3psw/zlib-1.2.11/inftrees.c b/clusterApp/3psw/zlib-1.2.11/inftrees.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/inftrees.c
rename to clusterApp/3psw/zlib-1.2.11/inftrees.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/inftrees.h b/clusterApp/3psw/zlib-1.2.11/inftrees.h
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/inftrees.h
rename to clusterApp/3psw/zlib-1.2.11/inftrees.h
diff --git a/insDavi2.0/3psw/zlib-1.2.11/libz.a b/clusterApp/3psw/zlib-1.2.11/libz.a
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/libz.a
rename to clusterApp/3psw/zlib-1.2.11/libz.a
diff --git a/insDavi2.0/3psw/zlib-1.2.11/libz.dll.a b/clusterApp/3psw/zlib-1.2.11/libz.dll.a
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/libz.dll.a
rename to clusterApp/3psw/zlib-1.2.11/libz.dll.a
diff --git a/insDavi2.0/3psw/zlib-1.2.11/make_vms.com b/clusterApp/3psw/zlib-1.2.11/make_vms.com
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/make_vms.com
rename to clusterApp/3psw/zlib-1.2.11/make_vms.com
diff --git a/insDavi2.0/3psw/zlib-1.2.11/minigzip.exe b/clusterApp/3psw/zlib-1.2.11/minigzip.exe
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/minigzip.exe
rename to clusterApp/3psw/zlib-1.2.11/minigzip.exe
diff --git a/insDavi2.0/3psw/zlib-1.2.11/minigzip_d.exe b/clusterApp/3psw/zlib-1.2.11/minigzip_d.exe
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/minigzip_d.exe
rename to clusterApp/3psw/zlib-1.2.11/minigzip_d.exe
diff --git a/insDavi2.0/3psw/zlib-1.2.11/msdos/Makefile.bor b/clusterApp/3psw/zlib-1.2.11/msdos/Makefile.bor
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/msdos/Makefile.bor
rename to clusterApp/3psw/zlib-1.2.11/msdos/Makefile.bor
diff --git a/insDavi2.0/3psw/zlib-1.2.11/msdos/Makefile.dj2 b/clusterApp/3psw/zlib-1.2.11/msdos/Makefile.dj2
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/msdos/Makefile.dj2
rename to clusterApp/3psw/zlib-1.2.11/msdos/Makefile.dj2
diff --git a/insDavi2.0/3psw/zlib-1.2.11/msdos/Makefile.emx b/clusterApp/3psw/zlib-1.2.11/msdos/Makefile.emx
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/msdos/Makefile.emx
rename to clusterApp/3psw/zlib-1.2.11/msdos/Makefile.emx
diff --git a/insDavi2.0/3psw/zlib-1.2.11/msdos/Makefile.msc b/clusterApp/3psw/zlib-1.2.11/msdos/Makefile.msc
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/msdos/Makefile.msc
rename to clusterApp/3psw/zlib-1.2.11/msdos/Makefile.msc
diff --git a/insDavi2.0/3psw/zlib-1.2.11/msdos/Makefile.tc b/clusterApp/3psw/zlib-1.2.11/msdos/Makefile.tc
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/msdos/Makefile.tc
rename to clusterApp/3psw/zlib-1.2.11/msdos/Makefile.tc
diff --git a/insDavi2.0/3psw/zlib-1.2.11/nintendods/Makefile b/clusterApp/3psw/zlib-1.2.11/nintendods/Makefile
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/nintendods/Makefile
rename to clusterApp/3psw/zlib-1.2.11/nintendods/Makefile
diff --git a/insDavi2.0/3psw/zlib-1.2.11/nintendods/README b/clusterApp/3psw/zlib-1.2.11/nintendods/README
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/nintendods/README
rename to clusterApp/3psw/zlib-1.2.11/nintendods/README
diff --git a/insDavi2.0/3psw/zlib-1.2.11/old/Makefile.emx b/clusterApp/3psw/zlib-1.2.11/old/Makefile.emx
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/old/Makefile.emx
rename to clusterApp/3psw/zlib-1.2.11/old/Makefile.emx
diff --git a/insDavi2.0/3psw/zlib-1.2.11/old/Makefile.riscos b/clusterApp/3psw/zlib-1.2.11/old/Makefile.riscos
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/old/Makefile.riscos
rename to clusterApp/3psw/zlib-1.2.11/old/Makefile.riscos
diff --git a/insDavi2.0/3psw/zlib-1.2.11/old/README b/clusterApp/3psw/zlib-1.2.11/old/README
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/old/README
rename to clusterApp/3psw/zlib-1.2.11/old/README
diff --git a/insDavi2.0/3psw/zlib-1.2.11/old/descrip.mms b/clusterApp/3psw/zlib-1.2.11/old/descrip.mms
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/old/descrip.mms
rename to clusterApp/3psw/zlib-1.2.11/old/descrip.mms
diff --git a/insDavi2.0/3psw/zlib-1.2.11/old/os2/Makefile.os2 b/clusterApp/3psw/zlib-1.2.11/old/os2/Makefile.os2
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/old/os2/Makefile.os2
rename to clusterApp/3psw/zlib-1.2.11/old/os2/Makefile.os2
diff --git a/insDavi2.0/3psw/zlib-1.2.11/old/os2/zlib.def b/clusterApp/3psw/zlib-1.2.11/old/os2/zlib.def
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/old/os2/zlib.def
rename to clusterApp/3psw/zlib-1.2.11/old/os2/zlib.def
diff --git a/insDavi2.0/3psw/zlib-1.2.11/old/visual-basic.txt b/clusterApp/3psw/zlib-1.2.11/old/visual-basic.txt
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/old/visual-basic.txt
rename to clusterApp/3psw/zlib-1.2.11/old/visual-basic.txt
diff --git a/insDavi2.0/3psw/zlib-1.2.11/os400/README400 b/clusterApp/3psw/zlib-1.2.11/os400/README400
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/os400/README400
rename to clusterApp/3psw/zlib-1.2.11/os400/README400
diff --git a/insDavi2.0/3psw/zlib-1.2.11/os400/bndsrc b/clusterApp/3psw/zlib-1.2.11/os400/bndsrc
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/os400/bndsrc
rename to clusterApp/3psw/zlib-1.2.11/os400/bndsrc
diff --git a/insDavi2.0/3psw/zlib-1.2.11/os400/make.sh b/clusterApp/3psw/zlib-1.2.11/os400/make.sh
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/os400/make.sh
rename to clusterApp/3psw/zlib-1.2.11/os400/make.sh
diff --git a/insDavi2.0/3psw/zlib-1.2.11/os400/zlib.inc b/clusterApp/3psw/zlib-1.2.11/os400/zlib.inc
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/os400/zlib.inc
rename to clusterApp/3psw/zlib-1.2.11/os400/zlib.inc
diff --git a/insDavi2.0/3psw/zlib-1.2.11/qnx/package.qpg b/clusterApp/3psw/zlib-1.2.11/qnx/package.qpg
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/qnx/package.qpg
rename to clusterApp/3psw/zlib-1.2.11/qnx/package.qpg
diff --git a/insDavi2.0/3psw/zlib-1.2.11/test/example.c b/clusterApp/3psw/zlib-1.2.11/test/example.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/test/example.c
rename to clusterApp/3psw/zlib-1.2.11/test/example.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/test/infcover.c b/clusterApp/3psw/zlib-1.2.11/test/infcover.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/test/infcover.c
rename to clusterApp/3psw/zlib-1.2.11/test/infcover.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/test/minigzip.c b/clusterApp/3psw/zlib-1.2.11/test/minigzip.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/test/minigzip.c
rename to clusterApp/3psw/zlib-1.2.11/test/minigzip.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/treebuild.xml b/clusterApp/3psw/zlib-1.2.11/treebuild.xml
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/treebuild.xml
rename to clusterApp/3psw/zlib-1.2.11/treebuild.xml
diff --git a/insDavi2.0/3psw/zlib-1.2.11/trees.c b/clusterApp/3psw/zlib-1.2.11/trees.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/trees.c
rename to clusterApp/3psw/zlib-1.2.11/trees.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/trees.h b/clusterApp/3psw/zlib-1.2.11/trees.h
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/trees.h
rename to clusterApp/3psw/zlib-1.2.11/trees.h
diff --git a/insDavi2.0/3psw/zlib-1.2.11/uncompr.c b/clusterApp/3psw/zlib-1.2.11/uncompr.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/uncompr.c
rename to clusterApp/3psw/zlib-1.2.11/uncompr.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/watcom/watcom_f.mak b/clusterApp/3psw/zlib-1.2.11/watcom/watcom_f.mak
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/watcom/watcom_f.mak
rename to clusterApp/3psw/zlib-1.2.11/watcom/watcom_f.mak
diff --git a/insDavi2.0/3psw/zlib-1.2.11/watcom/watcom_l.mak b/clusterApp/3psw/zlib-1.2.11/watcom/watcom_l.mak
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/watcom/watcom_l.mak
rename to clusterApp/3psw/zlib-1.2.11/watcom/watcom_l.mak
diff --git a/insDavi2.0/3psw/zlib-1.2.11/win32/DLL_FAQ.txt b/clusterApp/3psw/zlib-1.2.11/win32/DLL_FAQ.txt
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/win32/DLL_FAQ.txt
rename to clusterApp/3psw/zlib-1.2.11/win32/DLL_FAQ.txt
diff --git a/insDavi2.0/3psw/zlib-1.2.11/win32/Makefile.bor b/clusterApp/3psw/zlib-1.2.11/win32/Makefile.bor
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/win32/Makefile.bor
rename to clusterApp/3psw/zlib-1.2.11/win32/Makefile.bor
diff --git a/insDavi2.0/3psw/zlib-1.2.11/win32/Makefile.gcc b/clusterApp/3psw/zlib-1.2.11/win32/Makefile.gcc
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/win32/Makefile.gcc
rename to clusterApp/3psw/zlib-1.2.11/win32/Makefile.gcc
diff --git a/insDavi2.0/3psw/zlib-1.2.11/win32/Makefile.msc b/clusterApp/3psw/zlib-1.2.11/win32/Makefile.msc
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/win32/Makefile.msc
rename to clusterApp/3psw/zlib-1.2.11/win32/Makefile.msc
diff --git a/insDavi2.0/3psw/zlib-1.2.11/win32/README-WIN32.txt b/clusterApp/3psw/zlib-1.2.11/win32/README-WIN32.txt
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/win32/README-WIN32.txt
rename to clusterApp/3psw/zlib-1.2.11/win32/README-WIN32.txt
diff --git a/insDavi2.0/3psw/zlib-1.2.11/win32/VisualC.txt b/clusterApp/3psw/zlib-1.2.11/win32/VisualC.txt
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/win32/VisualC.txt
rename to clusterApp/3psw/zlib-1.2.11/win32/VisualC.txt
diff --git a/insDavi2.0/3psw/zlib-1.2.11/win32/zlib.def b/clusterApp/3psw/zlib-1.2.11/win32/zlib.def
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/win32/zlib.def
rename to clusterApp/3psw/zlib-1.2.11/win32/zlib.def
diff --git a/insDavi2.0/3psw/zlib-1.2.11/win32/zlib1.rc b/clusterApp/3psw/zlib-1.2.11/win32/zlib1.rc
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/win32/zlib1.rc
rename to clusterApp/3psw/zlib-1.2.11/win32/zlib1.rc
diff --git a/insDavi2.0/3psw/zlib-1.2.11/zconf.h b/clusterApp/3psw/zlib-1.2.11/zconf.h
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/zconf.h
rename to clusterApp/3psw/zlib-1.2.11/zconf.h
diff --git a/insDavi2.0/3psw/zlib-1.2.11/zconf.h.cmakein b/clusterApp/3psw/zlib-1.2.11/zconf.h.cmakein
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/zconf.h.cmakein
rename to clusterApp/3psw/zlib-1.2.11/zconf.h.cmakein
diff --git a/insDavi2.0/3psw/zlib-1.2.11/zconf.h.in b/clusterApp/3psw/zlib-1.2.11/zconf.h.in
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/zconf.h.in
rename to clusterApp/3psw/zlib-1.2.11/zconf.h.in
diff --git a/insDavi2.0/3psw/zlib-1.2.11/zconf.h.included b/clusterApp/3psw/zlib-1.2.11/zconf.h.included
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/zconf.h.included
rename to clusterApp/3psw/zlib-1.2.11/zconf.h.included
diff --git a/insDavi2.0/3psw/zlib-1.2.11/zlib.3 b/clusterApp/3psw/zlib-1.2.11/zlib.3
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/zlib.3
rename to clusterApp/3psw/zlib-1.2.11/zlib.3
diff --git a/insDavi2.0/3psw/zlib-1.2.11/zlib.3.pdf b/clusterApp/3psw/zlib-1.2.11/zlib.3.pdf
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/zlib.3.pdf
rename to clusterApp/3psw/zlib-1.2.11/zlib.3.pdf
diff --git a/insDavi2.0/3psw/zlib-1.2.11/zlib.h b/clusterApp/3psw/zlib-1.2.11/zlib.h
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/zlib.h
rename to clusterApp/3psw/zlib-1.2.11/zlib.h
diff --git a/insDavi2.0/3psw/zlib-1.2.11/zlib.map b/clusterApp/3psw/zlib-1.2.11/zlib.map
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/zlib.map
rename to clusterApp/3psw/zlib-1.2.11/zlib.map
diff --git a/insDavi2.0/3psw/zlib-1.2.11/zlib.pc.cmakein b/clusterApp/3psw/zlib-1.2.11/zlib.pc.cmakein
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/zlib.pc.cmakein
rename to clusterApp/3psw/zlib-1.2.11/zlib.pc.cmakein
diff --git a/insDavi2.0/3psw/zlib-1.2.11/zlib.pc.in b/clusterApp/3psw/zlib-1.2.11/zlib.pc.in
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/zlib.pc.in
rename to clusterApp/3psw/zlib-1.2.11/zlib.pc.in
diff --git a/insDavi2.0/3psw/zlib-1.2.11/zlib1.dll b/clusterApp/3psw/zlib-1.2.11/zlib1.dll
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/zlib1.dll
rename to clusterApp/3psw/zlib-1.2.11/zlib1.dll
diff --git a/insDavi2.0/3psw/zlib-1.2.11/zlib2ansi b/clusterApp/3psw/zlib-1.2.11/zlib2ansi
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/zlib2ansi
rename to clusterApp/3psw/zlib-1.2.11/zlib2ansi
diff --git a/insDavi2.0/3psw/zlib-1.2.11/zlib_built/example.exe b/clusterApp/3psw/zlib-1.2.11/zlib_built/example.exe
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/zlib_built/example.exe
rename to clusterApp/3psw/zlib-1.2.11/zlib_built/example.exe
diff --git a/insDavi2.0/3psw/zlib-1.2.11/zlib_built/example64.exe b/clusterApp/3psw/zlib-1.2.11/zlib_built/example64.exe
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/zlib_built/example64.exe
rename to clusterApp/3psw/zlib-1.2.11/zlib_built/example64.exe
diff --git a/insDavi2.0/3psw/zlib-1.2.11/zlib_built/libzlib.dll b/clusterApp/3psw/zlib-1.2.11/zlib_built/libzlib.dll
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/zlib_built/libzlib.dll
rename to clusterApp/3psw/zlib-1.2.11/zlib_built/libzlib.dll
diff --git a/insDavi2.0/3psw/zlib-1.2.11/zlib_built/libzlib.dll.a b/clusterApp/3psw/zlib-1.2.11/zlib_built/libzlib.dll.a
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/zlib_built/libzlib.dll.a
rename to clusterApp/3psw/zlib-1.2.11/zlib_built/libzlib.dll.a
diff --git a/insDavi2.0/3psw/zlib-1.2.11/zlib_built/libzlibstatic.a b/clusterApp/3psw/zlib-1.2.11/zlib_built/libzlibstatic.a
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/zlib_built/libzlibstatic.a
rename to clusterApp/3psw/zlib-1.2.11/zlib_built/libzlibstatic.a
diff --git a/insDavi2.0/3psw/zlib-1.2.11/zlib_built/minigzip.exe b/clusterApp/3psw/zlib-1.2.11/zlib_built/minigzip.exe
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/zlib_built/minigzip.exe
rename to clusterApp/3psw/zlib-1.2.11/zlib_built/minigzip.exe
diff --git a/insDavi2.0/3psw/zlib-1.2.11/zlib_built/minigzip64.exe b/clusterApp/3psw/zlib-1.2.11/zlib_built/minigzip64.exe
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/zlib_built/minigzip64.exe
rename to clusterApp/3psw/zlib-1.2.11/zlib_built/minigzip64.exe
diff --git a/insDavi2.0/3psw/zlib-1.2.11/zlib_built/zconf.h b/clusterApp/3psw/zlib-1.2.11/zlib_built/zconf.h
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/zlib_built/zconf.h
rename to clusterApp/3psw/zlib-1.2.11/zlib_built/zconf.h
diff --git a/insDavi2.0/3psw/zlib-1.2.11/zlib_built/zlib.h b/clusterApp/3psw/zlib-1.2.11/zlib_built/zlib.h
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/zlib_built/zlib.h
rename to clusterApp/3psw/zlib-1.2.11/zlib_built/zlib.h
diff --git a/insDavi2.0/3psw/zlib-1.2.11/zutil.c b/clusterApp/3psw/zlib-1.2.11/zutil.c
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/zutil.c
rename to clusterApp/3psw/zlib-1.2.11/zutil.c
diff --git a/insDavi2.0/3psw/zlib-1.2.11/zutil.h b/clusterApp/3psw/zlib-1.2.11/zutil.h
similarity index 100%
rename from insDavi2.0/3psw/zlib-1.2.11/zutil.h
rename to clusterApp/3psw/zlib-1.2.11/zutil.h
diff --git a/insDavi2.0/GenTextResource.exe b/clusterApp/GenTextResource.exe
similarity index 100%
rename from insDavi2.0/GenTextResource.exe
rename to clusterApp/GenTextResource.exe
diff --git a/insDavi2.0/Makefile b/clusterApp/Makefile
similarity index 61%
rename from insDavi2.0/Makefile
rename to clusterApp/Makefile
index 3441ea8..51e62dd 100644
--- a/insDavi2.0/Makefile
+++ b/clusterApp/Makefile
@@ -4,11 +4,11 @@ CD		=	make --no-print-directory
 BIN		=	$(DESTDIR)/$(APPNAME)
 
 ROOTFS = /home/lst/workspace/rootfs/
-TARGET_PATH_LIB = $(ROOTFS)/usr/lib
-TARGET_PATH_INCLUDE = $(ROOTFS)/usr/include
+TARGET_PATH_LIB = /usr/lib64
+TARGET_PATH_INCLUDE = /usr/include
 TFPT_DIR = /home/lst/workspace/rootfs/root/app/
 
-CFLAGS = -mfloat-abi=softfp -mfpu=neon -fPIC -fno-strict-aliasing -fno-optimize-sibling-calls -Wall
+CFLAGS = -fPIC -fno-strict-aliasing -fno-optimize-sibling-calls -Wall
 
 ifdef DEBUG
 CFLAGS += -g -DDEBUG -DINST_DEBUG
@@ -16,19 +16,23 @@ else
 CFLAGS += -O3 -fexpensive-optimizations
 endif
 
-DEPS = -lpthread -lGLESv2 -lEGL -lfreetype -lm -ldl -Wl,--library-path=$(TARGET_PATH_LIB),-rpath-link=$(TARGET_PATH_LIB) 
-DEPS += /home/lst/workspace/jpeg/jpeg-9c/install/lib/libjpeg.a
+DEPS = -lpthread -lEGL -lGLESv2 -ldrm -lgbm -lfreetype -lm -ldl -Wl,--library-path=$(TARGET_PATH_LIB),-rpath-link=$(TARGET_PATH_LIB) 
+## DEPS += /home/lst/workspace/jpeg/jpeg-9c/install/lib/libjpeg.a
+DEPS += /home/huaxu/develop/cluster/3psw/source_packages/build_install/lib/libjpeg.a
 DEPS += -lz -lpng16
 
 #Make command to use for dependencies
 CROSS_COMPILE = /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/arm-fsl-linux-gnueabi-
-CC = $(CROSS_COMPILE)gcc 
-AR = $(CROSS_COMPILE)ar
+CC = gcc 
+AR = ar
 
 SUBDIR	= ./src
 
 CFLAGS += -DLINUX \
-	-DEGL_API_FB
+	-DEGL_API_FB \
+	-DCOMPILE_IN_UBUNTU
+	##\
+	##-DCOMPILE_IN_WINDOWS
 
 CFLAGS += -Iinclude \
 	-I$(TARGET_PATH_INCLUDE) \
@@ -36,8 +40,16 @@ CFLAGS += -Iinclude \
 	-I/home/lst/workspace/jpeg/jpeg-9c/install/include \
 	-I/home/lst/workspace/zlib/zlib_build/ \
 	-I/home/lst/workspace/libpng/libpng_build/ \
+	-I/home/huaxu/develop/cluster/3psw/source_packages/build_install/ \
+	-I/home/huaxu/develop/cluster/3psw/source_packages/libpng-1.6.34/ \
+	-I/home/huaxu/develop/cluster/3psw/source_packages/freetype-2.13.2/ \
+	-I/home/huaxu/develop/ICM-SOFT/D20/icm-code/cpu/app/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/ \
+	-I/usr/include/GL/ \
+	-I/usr/include/drm/ \
 	-I$(ROOTFS)/usr/src/linux/include
 
+CFLAGS += -L/home/huaxu/develop/cluster/3psw/source_packages/build_install/lib/
+
 SOURCES	=	$(shell find $(SUBDIR) -name "*.c")
 
 BIN_SOURCE	=	./main.c
@@ -51,7 +63,7 @@ compile_tips:
 	@echo "************************"
 	@echo "Compile Tools"
 	@echo "***************"
-	@echo $(CROSS_COMPILE)gcc
+	@echo gcc
 	@echo "***************"
 
 
@@ -72,12 +84,12 @@ finish_tips:
 $(BIN) : $(BIN_OBJECTS)
 	@echo " LD " $@
 	@echo " LD depen " $<
-	@$(QUIET)$(CC) -o $(BIN) $(BIN_OBJECTS) $(DEPS) src/lib/libcjson_linux.a
+	@$(QUIET)$(CC) -o $(BIN) $(BIN_OBJECTS) $(DEPS) /home/huaxu/develop/cluster/3psw/source_packages/build_install/lib/libcjson.a
 	@echo -e " BD  $(BIN) Build Success!\n"
 
 install: $(BIN)
-	@echo " CP " $(BIN) $(TFPT_DIR)
-	@cp $(BIN) $(TFPT_DIR)
+	##@echo " CP " $(BIN) $(TFPT_DIR)
+	##@cp $(BIN) $(TFPT_DIR)
 	@echo " SYNC "
 	@sync
 
diff --git a/insDavi2.0/Makefile.bkup b/clusterApp/Makefile.bkup
similarity index 100%
rename from insDavi2.0/Makefile.bkup
rename to clusterApp/Makefile.bkup
diff --git a/insDavi2.0/Res/font/Xpeng-Medium.ttf b/clusterApp/Res/font/Xpeng-Medium.ttf
similarity index 100%
rename from insDavi2.0/Res/font/Xpeng-Medium.ttf
rename to clusterApp/Res/font/Xpeng-Medium.ttf
diff --git a/insDavi2.0/Res/font/Xpeng-Regular.ttf b/clusterApp/Res/font/Xpeng-Regular.ttf
similarity index 100%
rename from insDavi2.0/Res/font/Xpeng-Regular.ttf
rename to clusterApp/Res/font/Xpeng-Regular.ttf
diff --git a/insDavi2.0/Res/image/ACC_009.png b/clusterApp/Res/image/ACC_009.png
similarity index 100%
rename from insDavi2.0/Res/image/ACC_009.png
rename to clusterApp/Res/image/ACC_009.png
diff --git a/insDavi2.0/Res/image/ACC_028.png b/clusterApp/Res/image/ACC_028.png
similarity index 100%
rename from insDavi2.0/Res/image/ACC_028.png
rename to clusterApp/Res/image/ACC_028.png
diff --git a/insDavi2.0/Res/image/AI_parking_available_leftarea.tga b/clusterApp/Res/image/AI_parking_available_leftarea.tga
similarity index 100%
rename from insDavi2.0/Res/image/AI_parking_available_leftarea.tga
rename to clusterApp/Res/image/AI_parking_available_leftarea.tga
diff --git a/insDavi2.0/Res/image/AI_parking_available_leftslot1.tga b/clusterApp/Res/image/AI_parking_available_leftslot1.tga
similarity index 100%
rename from insDavi2.0/Res/image/AI_parking_available_leftslot1.tga
rename to clusterApp/Res/image/AI_parking_available_leftslot1.tga
diff --git a/insDavi2.0/Res/image/AI_parking_available_leftslot2.tga b/clusterApp/Res/image/AI_parking_available_leftslot2.tga
similarity index 100%
rename from insDavi2.0/Res/image/AI_parking_available_leftslot2.tga
rename to clusterApp/Res/image/AI_parking_available_leftslot2.tga
diff --git a/insDavi2.0/Res/image/AI_parking_available_leftslot3.tga b/clusterApp/Res/image/AI_parking_available_leftslot3.tga
similarity index 100%
rename from insDavi2.0/Res/image/AI_parking_available_leftslot3.tga
rename to clusterApp/Res/image/AI_parking_available_leftslot3.tga
diff --git a/insDavi2.0/Res/image/AI_parking_available_rightarea.tga b/clusterApp/Res/image/AI_parking_available_rightarea.tga
similarity index 100%
rename from insDavi2.0/Res/image/AI_parking_available_rightarea.tga
rename to clusterApp/Res/image/AI_parking_available_rightarea.tga
diff --git a/insDavi2.0/Res/image/AI_parking_available_rightslot1.tga b/clusterApp/Res/image/AI_parking_available_rightslot1.tga
similarity index 100%
rename from insDavi2.0/Res/image/AI_parking_available_rightslot1.tga
rename to clusterApp/Res/image/AI_parking_available_rightslot1.tga
diff --git a/insDavi2.0/Res/image/AI_parking_available_rightslot2.tga b/clusterApp/Res/image/AI_parking_available_rightslot2.tga
similarity index 100%
rename from insDavi2.0/Res/image/AI_parking_available_rightslot2.tga
rename to clusterApp/Res/image/AI_parking_available_rightslot2.tga
diff --git a/insDavi2.0/Res/image/AI_parking_available_rightslot3.tga b/clusterApp/Res/image/AI_parking_available_rightslot3.tga
similarity index 100%
rename from insDavi2.0/Res/image/AI_parking_available_rightslot3.tga
rename to clusterApp/Res/image/AI_parking_available_rightslot3.tga
diff --git a/insDavi2.0/Res/image/AI_parking_unavailable_leftslot1.tga b/clusterApp/Res/image/AI_parking_unavailable_leftslot1.tga
similarity index 100%
rename from insDavi2.0/Res/image/AI_parking_unavailable_leftslot1.tga
rename to clusterApp/Res/image/AI_parking_unavailable_leftslot1.tga
diff --git a/insDavi2.0/Res/image/AI_parking_unavailable_leftslot2.tga b/clusterApp/Res/image/AI_parking_unavailable_leftslot2.tga
similarity index 100%
rename from insDavi2.0/Res/image/AI_parking_unavailable_leftslot2.tga
rename to clusterApp/Res/image/AI_parking_unavailable_leftslot2.tga
diff --git a/insDavi2.0/Res/image/AI_parking_unavailable_leftslot3.tga b/clusterApp/Res/image/AI_parking_unavailable_leftslot3.tga
similarity index 100%
rename from insDavi2.0/Res/image/AI_parking_unavailable_leftslot3.tga
rename to clusterApp/Res/image/AI_parking_unavailable_leftslot3.tga
diff --git a/insDavi2.0/Res/image/AI_parking_unavailable_rightslot1.tga b/clusterApp/Res/image/AI_parking_unavailable_rightslot1.tga
similarity index 100%
rename from insDavi2.0/Res/image/AI_parking_unavailable_rightslot1.tga
rename to clusterApp/Res/image/AI_parking_unavailable_rightslot1.tga
diff --git a/insDavi2.0/Res/image/AI_parking_unavailable_rightslot2.tga b/clusterApp/Res/image/AI_parking_unavailable_rightslot2.tga
similarity index 100%
rename from insDavi2.0/Res/image/AI_parking_unavailable_rightslot2.tga
rename to clusterApp/Res/image/AI_parking_unavailable_rightslot2.tga
diff --git a/insDavi2.0/Res/image/AI_parking_unavailable_rightslot3.tga b/clusterApp/Res/image/AI_parking_unavailable_rightslot3.tga
similarity index 100%
rename from insDavi2.0/Res/image/AI_parking_unavailable_rightslot3.tga
rename to clusterApp/Res/image/AI_parking_unavailable_rightslot3.tga
diff --git a/insDavi2.0/Res/image/AI_parking_used_leftslot1.tga b/clusterApp/Res/image/AI_parking_used_leftslot1.tga
similarity index 100%
rename from insDavi2.0/Res/image/AI_parking_used_leftslot1.tga
rename to clusterApp/Res/image/AI_parking_used_leftslot1.tga
diff --git a/insDavi2.0/Res/image/AI_parking_used_leftslot2.tga b/clusterApp/Res/image/AI_parking_used_leftslot2.tga
similarity index 100%
rename from insDavi2.0/Res/image/AI_parking_used_leftslot2.tga
rename to clusterApp/Res/image/AI_parking_used_leftslot2.tga
diff --git a/insDavi2.0/Res/image/AI_parking_used_leftslot3.tga b/clusterApp/Res/image/AI_parking_used_leftslot3.tga
similarity index 100%
rename from insDavi2.0/Res/image/AI_parking_used_leftslot3.tga
rename to clusterApp/Res/image/AI_parking_used_leftslot3.tga
diff --git a/insDavi2.0/Res/image/AI_parking_used_rigthslot1.tga b/clusterApp/Res/image/AI_parking_used_rigthslot1.tga
similarity index 100%
rename from insDavi2.0/Res/image/AI_parking_used_rigthslot1.tga
rename to clusterApp/Res/image/AI_parking_used_rigthslot1.tga
diff --git a/insDavi2.0/Res/image/AI_parking_used_rigthslot2.tga b/clusterApp/Res/image/AI_parking_used_rigthslot2.tga
similarity index 100%
rename from insDavi2.0/Res/image/AI_parking_used_rigthslot2.tga
rename to clusterApp/Res/image/AI_parking_used_rigthslot2.tga
diff --git a/insDavi2.0/Res/image/AI_parking_used_rigthslot3.tga b/clusterApp/Res/image/AI_parking_used_rigthslot3.tga
similarity index 100%
rename from insDavi2.0/Res/image/AI_parking_used_rigthslot3.tga
rename to clusterApp/Res/image/AI_parking_used_rigthslot3.tga
diff --git a/insDavi2.0/Res/image/Charging_Charging_000.png b/clusterApp/Res/image/Charging_Charging_000.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_000.png
rename to clusterApp/Res/image/Charging_Charging_000.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_001.png b/clusterApp/Res/image/Charging_Charging_001.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_001.png
rename to clusterApp/Res/image/Charging_Charging_001.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_002.png b/clusterApp/Res/image/Charging_Charging_002.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_002.png
rename to clusterApp/Res/image/Charging_Charging_002.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_003.png b/clusterApp/Res/image/Charging_Charging_003.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_003.png
rename to clusterApp/Res/image/Charging_Charging_003.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_004.png b/clusterApp/Res/image/Charging_Charging_004.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_004.png
rename to clusterApp/Res/image/Charging_Charging_004.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_005.png b/clusterApp/Res/image/Charging_Charging_005.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_005.png
rename to clusterApp/Res/image/Charging_Charging_005.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_006.png b/clusterApp/Res/image/Charging_Charging_006.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_006.png
rename to clusterApp/Res/image/Charging_Charging_006.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_007.png b/clusterApp/Res/image/Charging_Charging_007.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_007.png
rename to clusterApp/Res/image/Charging_Charging_007.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_008.png b/clusterApp/Res/image/Charging_Charging_008.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_008.png
rename to clusterApp/Res/image/Charging_Charging_008.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_009.png b/clusterApp/Res/image/Charging_Charging_009.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_009.png
rename to clusterApp/Res/image/Charging_Charging_009.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_010.png b/clusterApp/Res/image/Charging_Charging_010.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_010.png
rename to clusterApp/Res/image/Charging_Charging_010.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_011.png b/clusterApp/Res/image/Charging_Charging_011.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_011.png
rename to clusterApp/Res/image/Charging_Charging_011.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_012.png b/clusterApp/Res/image/Charging_Charging_012.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_012.png
rename to clusterApp/Res/image/Charging_Charging_012.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_013.png b/clusterApp/Res/image/Charging_Charging_013.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_013.png
rename to clusterApp/Res/image/Charging_Charging_013.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_014.png b/clusterApp/Res/image/Charging_Charging_014.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_014.png
rename to clusterApp/Res/image/Charging_Charging_014.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_015.png b/clusterApp/Res/image/Charging_Charging_015.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_015.png
rename to clusterApp/Res/image/Charging_Charging_015.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_016.png b/clusterApp/Res/image/Charging_Charging_016.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_016.png
rename to clusterApp/Res/image/Charging_Charging_016.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_017.png b/clusterApp/Res/image/Charging_Charging_017.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_017.png
rename to clusterApp/Res/image/Charging_Charging_017.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_018.png b/clusterApp/Res/image/Charging_Charging_018.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_018.png
rename to clusterApp/Res/image/Charging_Charging_018.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_019.png b/clusterApp/Res/image/Charging_Charging_019.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_019.png
rename to clusterApp/Res/image/Charging_Charging_019.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_020.png b/clusterApp/Res/image/Charging_Charging_020.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_020.png
rename to clusterApp/Res/image/Charging_Charging_020.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_021.png b/clusterApp/Res/image/Charging_Charging_021.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_021.png
rename to clusterApp/Res/image/Charging_Charging_021.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_022.png b/clusterApp/Res/image/Charging_Charging_022.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_022.png
rename to clusterApp/Res/image/Charging_Charging_022.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_023.png b/clusterApp/Res/image/Charging_Charging_023.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_023.png
rename to clusterApp/Res/image/Charging_Charging_023.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_024.png b/clusterApp/Res/image/Charging_Charging_024.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_024.png
rename to clusterApp/Res/image/Charging_Charging_024.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_025.png b/clusterApp/Res/image/Charging_Charging_025.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_025.png
rename to clusterApp/Res/image/Charging_Charging_025.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_026.png b/clusterApp/Res/image/Charging_Charging_026.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_026.png
rename to clusterApp/Res/image/Charging_Charging_026.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_027.png b/clusterApp/Res/image/Charging_Charging_027.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_027.png
rename to clusterApp/Res/image/Charging_Charging_027.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_028.png b/clusterApp/Res/image/Charging_Charging_028.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_028.png
rename to clusterApp/Res/image/Charging_Charging_028.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_029.png b/clusterApp/Res/image/Charging_Charging_029.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_029.png
rename to clusterApp/Res/image/Charging_Charging_029.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_030.png b/clusterApp/Res/image/Charging_Charging_030.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_030.png
rename to clusterApp/Res/image/Charging_Charging_030.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_031.png b/clusterApp/Res/image/Charging_Charging_031.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_031.png
rename to clusterApp/Res/image/Charging_Charging_031.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_032.png b/clusterApp/Res/image/Charging_Charging_032.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_032.png
rename to clusterApp/Res/image/Charging_Charging_032.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_033.png b/clusterApp/Res/image/Charging_Charging_033.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_033.png
rename to clusterApp/Res/image/Charging_Charging_033.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_034.png b/clusterApp/Res/image/Charging_Charging_034.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_034.png
rename to clusterApp/Res/image/Charging_Charging_034.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_035.png b/clusterApp/Res/image/Charging_Charging_035.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_035.png
rename to clusterApp/Res/image/Charging_Charging_035.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_036.png b/clusterApp/Res/image/Charging_Charging_036.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_036.png
rename to clusterApp/Res/image/Charging_Charging_036.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_037.png b/clusterApp/Res/image/Charging_Charging_037.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_037.png
rename to clusterApp/Res/image/Charging_Charging_037.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_038.png b/clusterApp/Res/image/Charging_Charging_038.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_038.png
rename to clusterApp/Res/image/Charging_Charging_038.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_039.png b/clusterApp/Res/image/Charging_Charging_039.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_039.png
rename to clusterApp/Res/image/Charging_Charging_039.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_040.png b/clusterApp/Res/image/Charging_Charging_040.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_040.png
rename to clusterApp/Res/image/Charging_Charging_040.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_041.png b/clusterApp/Res/image/Charging_Charging_041.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_041.png
rename to clusterApp/Res/image/Charging_Charging_041.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_042.png b/clusterApp/Res/image/Charging_Charging_042.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_042.png
rename to clusterApp/Res/image/Charging_Charging_042.png
diff --git a/insDavi2.0/Res/image/Charging_Charging_043.png b/clusterApp/Res/image/Charging_Charging_043.png
similarity index 100%
rename from insDavi2.0/Res/image/Charging_Charging_043.png
rename to clusterApp/Res/image/Charging_Charging_043.png
diff --git a/insDavi2.0/Res/image/LCC_009.png b/clusterApp/Res/image/LCC_009.png
similarity index 100%
rename from insDavi2.0/Res/image/LCC_009.png
rename to clusterApp/Res/image/LCC_009.png
diff --git a/insDavi2.0/Res/image/LCC_027.png b/clusterApp/Res/image/LCC_027.png
similarity index 100%
rename from insDavi2.0/Res/image/LCC_027.png
rename to clusterApp/Res/image/LCC_027.png
diff --git a/insDavi2.0/Res/image/Lane_assist_left.png b/clusterApp/Res/image/Lane_assist_left.png
similarity index 100%
rename from insDavi2.0/Res/image/Lane_assist_left.png
rename to clusterApp/Res/image/Lane_assist_left.png
diff --git a/insDavi2.0/Res/image/Lane_assist_left_alarm.png b/clusterApp/Res/image/Lane_assist_left_alarm.png
similarity index 100%
rename from insDavi2.0/Res/image/Lane_assist_left_alarm.png
rename to clusterApp/Res/image/Lane_assist_left_alarm.png
diff --git a/insDavi2.0/Res/image/Lane_assist_right.png b/clusterApp/Res/image/Lane_assist_right.png
similarity index 100%
rename from insDavi2.0/Res/image/Lane_assist_right.png
rename to clusterApp/Res/image/Lane_assist_right.png
diff --git a/insDavi2.0/Res/image/Lane_assist_right_alarm.png b/clusterApp/Res/image/Lane_assist_right_alarm.png
similarity index 100%
rename from insDavi2.0/Res/image/Lane_assist_right_alarm.png
rename to clusterApp/Res/image/Lane_assist_right_alarm.png
diff --git a/insDavi2.0/Res/image/VAI_in_000.png b/clusterApp/Res/image/VAI_in_000.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_000.png
rename to clusterApp/Res/image/VAI_in_000.png
diff --git a/insDavi2.0/Res/image/VAI_in_001.png b/clusterApp/Res/image/VAI_in_001.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_001.png
rename to clusterApp/Res/image/VAI_in_001.png
diff --git a/insDavi2.0/Res/image/VAI_in_002.png b/clusterApp/Res/image/VAI_in_002.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_002.png
rename to clusterApp/Res/image/VAI_in_002.png
diff --git a/insDavi2.0/Res/image/VAI_in_003.png b/clusterApp/Res/image/VAI_in_003.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_003.png
rename to clusterApp/Res/image/VAI_in_003.png
diff --git a/insDavi2.0/Res/image/VAI_in_004.png b/clusterApp/Res/image/VAI_in_004.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_004.png
rename to clusterApp/Res/image/VAI_in_004.png
diff --git a/insDavi2.0/Res/image/VAI_in_005.png b/clusterApp/Res/image/VAI_in_005.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_005.png
rename to clusterApp/Res/image/VAI_in_005.png
diff --git a/insDavi2.0/Res/image/VAI_in_006.png b/clusterApp/Res/image/VAI_in_006.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_006.png
rename to clusterApp/Res/image/VAI_in_006.png
diff --git a/insDavi2.0/Res/image/VAI_in_007.png b/clusterApp/Res/image/VAI_in_007.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_007.png
rename to clusterApp/Res/image/VAI_in_007.png
diff --git a/insDavi2.0/Res/image/VAI_in_008.png b/clusterApp/Res/image/VAI_in_008.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_008.png
rename to clusterApp/Res/image/VAI_in_008.png
diff --git a/insDavi2.0/Res/image/VAI_in_009.png b/clusterApp/Res/image/VAI_in_009.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_009.png
rename to clusterApp/Res/image/VAI_in_009.png
diff --git a/insDavi2.0/Res/image/VAI_in_010.png b/clusterApp/Res/image/VAI_in_010.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_010.png
rename to clusterApp/Res/image/VAI_in_010.png
diff --git a/insDavi2.0/Res/image/VAI_in_011.png b/clusterApp/Res/image/VAI_in_011.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_011.png
rename to clusterApp/Res/image/VAI_in_011.png
diff --git a/insDavi2.0/Res/image/VAI_in_012.png b/clusterApp/Res/image/VAI_in_012.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_012.png
rename to clusterApp/Res/image/VAI_in_012.png
diff --git a/insDavi2.0/Res/image/VAI_in_013.png b/clusterApp/Res/image/VAI_in_013.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_013.png
rename to clusterApp/Res/image/VAI_in_013.png
diff --git a/insDavi2.0/Res/image/VAI_in_014.png b/clusterApp/Res/image/VAI_in_014.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_014.png
rename to clusterApp/Res/image/VAI_in_014.png
diff --git a/insDavi2.0/Res/image/VAI_in_015.png b/clusterApp/Res/image/VAI_in_015.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_015.png
rename to clusterApp/Res/image/VAI_in_015.png
diff --git a/insDavi2.0/Res/image/VAI_in_016.png b/clusterApp/Res/image/VAI_in_016.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_016.png
rename to clusterApp/Res/image/VAI_in_016.png
diff --git a/insDavi2.0/Res/image/VAI_in_017.png b/clusterApp/Res/image/VAI_in_017.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_017.png
rename to clusterApp/Res/image/VAI_in_017.png
diff --git a/insDavi2.0/Res/image/VAI_in_018.png b/clusterApp/Res/image/VAI_in_018.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_018.png
rename to clusterApp/Res/image/VAI_in_018.png
diff --git a/insDavi2.0/Res/image/VAI_in_019.png b/clusterApp/Res/image/VAI_in_019.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_019.png
rename to clusterApp/Res/image/VAI_in_019.png
diff --git a/insDavi2.0/Res/image/VAI_in_020.png b/clusterApp/Res/image/VAI_in_020.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_020.png
rename to clusterApp/Res/image/VAI_in_020.png
diff --git a/insDavi2.0/Res/image/VAI_in_021.png b/clusterApp/Res/image/VAI_in_021.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_021.png
rename to clusterApp/Res/image/VAI_in_021.png
diff --git a/insDavi2.0/Res/image/VAI_in_022.png b/clusterApp/Res/image/VAI_in_022.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_022.png
rename to clusterApp/Res/image/VAI_in_022.png
diff --git a/insDavi2.0/Res/image/VAI_in_023.png b/clusterApp/Res/image/VAI_in_023.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_023.png
rename to clusterApp/Res/image/VAI_in_023.png
diff --git a/insDavi2.0/Res/image/VAI_in_024.png b/clusterApp/Res/image/VAI_in_024.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_024.png
rename to clusterApp/Res/image/VAI_in_024.png
diff --git a/insDavi2.0/Res/image/VAI_in_025.png b/clusterApp/Res/image/VAI_in_025.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_025.png
rename to clusterApp/Res/image/VAI_in_025.png
diff --git a/insDavi2.0/Res/image/VAI_in_026.png b/clusterApp/Res/image/VAI_in_026.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_026.png
rename to clusterApp/Res/image/VAI_in_026.png
diff --git a/insDavi2.0/Res/image/VAI_in_027.png b/clusterApp/Res/image/VAI_in_027.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_027.png
rename to clusterApp/Res/image/VAI_in_027.png
diff --git a/insDavi2.0/Res/image/VAI_in_028.png b/clusterApp/Res/image/VAI_in_028.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_028.png
rename to clusterApp/Res/image/VAI_in_028.png
diff --git a/insDavi2.0/Res/image/VAI_in_029.png b/clusterApp/Res/image/VAI_in_029.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_029.png
rename to clusterApp/Res/image/VAI_in_029.png
diff --git a/insDavi2.0/Res/image/VAI_in_030.png b/clusterApp/Res/image/VAI_in_030.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_030.png
rename to clusterApp/Res/image/VAI_in_030.png
diff --git a/insDavi2.0/Res/image/VAI_in_031.png b/clusterApp/Res/image/VAI_in_031.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_031.png
rename to clusterApp/Res/image/VAI_in_031.png
diff --git a/insDavi2.0/Res/image/VAI_in_032.png b/clusterApp/Res/image/VAI_in_032.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_032.png
rename to clusterApp/Res/image/VAI_in_032.png
diff --git a/insDavi2.0/Res/image/VAI_in_033.png b/clusterApp/Res/image/VAI_in_033.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_033.png
rename to clusterApp/Res/image/VAI_in_033.png
diff --git a/insDavi2.0/Res/image/VAI_in_034.png b/clusterApp/Res/image/VAI_in_034.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_034.png
rename to clusterApp/Res/image/VAI_in_034.png
diff --git a/insDavi2.0/Res/image/VAI_in_035.png b/clusterApp/Res/image/VAI_in_035.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_035.png
rename to clusterApp/Res/image/VAI_in_035.png
diff --git a/insDavi2.0/Res/image/VAI_in_036.png b/clusterApp/Res/image/VAI_in_036.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_036.png
rename to clusterApp/Res/image/VAI_in_036.png
diff --git a/insDavi2.0/Res/image/VAI_in_037.png b/clusterApp/Res/image/VAI_in_037.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_037.png
rename to clusterApp/Res/image/VAI_in_037.png
diff --git a/insDavi2.0/Res/image/VAI_in_038.png b/clusterApp/Res/image/VAI_in_038.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_038.png
rename to clusterApp/Res/image/VAI_in_038.png
diff --git a/insDavi2.0/Res/image/VAI_in_039.png b/clusterApp/Res/image/VAI_in_039.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_in_039.png
rename to clusterApp/Res/image/VAI_in_039.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_000.png b/clusterApp/Res/image/VAI_recognizing_000.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_000.png
rename to clusterApp/Res/image/VAI_recognizing_000.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_001.png b/clusterApp/Res/image/VAI_recognizing_001.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_001.png
rename to clusterApp/Res/image/VAI_recognizing_001.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_002.png b/clusterApp/Res/image/VAI_recognizing_002.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_002.png
rename to clusterApp/Res/image/VAI_recognizing_002.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_003.png b/clusterApp/Res/image/VAI_recognizing_003.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_003.png
rename to clusterApp/Res/image/VAI_recognizing_003.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_004.png b/clusterApp/Res/image/VAI_recognizing_004.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_004.png
rename to clusterApp/Res/image/VAI_recognizing_004.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_005.png b/clusterApp/Res/image/VAI_recognizing_005.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_005.png
rename to clusterApp/Res/image/VAI_recognizing_005.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_006.png b/clusterApp/Res/image/VAI_recognizing_006.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_006.png
rename to clusterApp/Res/image/VAI_recognizing_006.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_007.png b/clusterApp/Res/image/VAI_recognizing_007.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_007.png
rename to clusterApp/Res/image/VAI_recognizing_007.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_008.png b/clusterApp/Res/image/VAI_recognizing_008.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_008.png
rename to clusterApp/Res/image/VAI_recognizing_008.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_009.png b/clusterApp/Res/image/VAI_recognizing_009.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_009.png
rename to clusterApp/Res/image/VAI_recognizing_009.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_010.png b/clusterApp/Res/image/VAI_recognizing_010.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_010.png
rename to clusterApp/Res/image/VAI_recognizing_010.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_011.png b/clusterApp/Res/image/VAI_recognizing_011.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_011.png
rename to clusterApp/Res/image/VAI_recognizing_011.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_012.png b/clusterApp/Res/image/VAI_recognizing_012.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_012.png
rename to clusterApp/Res/image/VAI_recognizing_012.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_013.png b/clusterApp/Res/image/VAI_recognizing_013.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_013.png
rename to clusterApp/Res/image/VAI_recognizing_013.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_014.png b/clusterApp/Res/image/VAI_recognizing_014.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_014.png
rename to clusterApp/Res/image/VAI_recognizing_014.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_015.png b/clusterApp/Res/image/VAI_recognizing_015.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_015.png
rename to clusterApp/Res/image/VAI_recognizing_015.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_016.png b/clusterApp/Res/image/VAI_recognizing_016.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_016.png
rename to clusterApp/Res/image/VAI_recognizing_016.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_017.png b/clusterApp/Res/image/VAI_recognizing_017.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_017.png
rename to clusterApp/Res/image/VAI_recognizing_017.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_018.png b/clusterApp/Res/image/VAI_recognizing_018.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_018.png
rename to clusterApp/Res/image/VAI_recognizing_018.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_019.png b/clusterApp/Res/image/VAI_recognizing_019.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_019.png
rename to clusterApp/Res/image/VAI_recognizing_019.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_020.png b/clusterApp/Res/image/VAI_recognizing_020.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_020.png
rename to clusterApp/Res/image/VAI_recognizing_020.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_021.png b/clusterApp/Res/image/VAI_recognizing_021.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_021.png
rename to clusterApp/Res/image/VAI_recognizing_021.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_022.png b/clusterApp/Res/image/VAI_recognizing_022.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_022.png
rename to clusterApp/Res/image/VAI_recognizing_022.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_023.png b/clusterApp/Res/image/VAI_recognizing_023.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_023.png
rename to clusterApp/Res/image/VAI_recognizing_023.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_024.png b/clusterApp/Res/image/VAI_recognizing_024.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_024.png
rename to clusterApp/Res/image/VAI_recognizing_024.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_025.png b/clusterApp/Res/image/VAI_recognizing_025.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_025.png
rename to clusterApp/Res/image/VAI_recognizing_025.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_026.png b/clusterApp/Res/image/VAI_recognizing_026.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_026.png
rename to clusterApp/Res/image/VAI_recognizing_026.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_027.png b/clusterApp/Res/image/VAI_recognizing_027.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_027.png
rename to clusterApp/Res/image/VAI_recognizing_027.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_028.png b/clusterApp/Res/image/VAI_recognizing_028.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_028.png
rename to clusterApp/Res/image/VAI_recognizing_028.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_029.png b/clusterApp/Res/image/VAI_recognizing_029.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_029.png
rename to clusterApp/Res/image/VAI_recognizing_029.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_030.png b/clusterApp/Res/image/VAI_recognizing_030.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_030.png
rename to clusterApp/Res/image/VAI_recognizing_030.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_031.png b/clusterApp/Res/image/VAI_recognizing_031.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_031.png
rename to clusterApp/Res/image/VAI_recognizing_031.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_032.png b/clusterApp/Res/image/VAI_recognizing_032.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_032.png
rename to clusterApp/Res/image/VAI_recognizing_032.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_033.png b/clusterApp/Res/image/VAI_recognizing_033.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_033.png
rename to clusterApp/Res/image/VAI_recognizing_033.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_034.png b/clusterApp/Res/image/VAI_recognizing_034.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_034.png
rename to clusterApp/Res/image/VAI_recognizing_034.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_035.png b/clusterApp/Res/image/VAI_recognizing_035.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_035.png
rename to clusterApp/Res/image/VAI_recognizing_035.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_036.png b/clusterApp/Res/image/VAI_recognizing_036.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_036.png
rename to clusterApp/Res/image/VAI_recognizing_036.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_037.png b/clusterApp/Res/image/VAI_recognizing_037.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_037.png
rename to clusterApp/Res/image/VAI_recognizing_037.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_038.png b/clusterApp/Res/image/VAI_recognizing_038.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_038.png
rename to clusterApp/Res/image/VAI_recognizing_038.png
diff --git a/insDavi2.0/Res/image/VAI_recognizing_039.png b/clusterApp/Res/image/VAI_recognizing_039.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_recognizing_039.png
rename to clusterApp/Res/image/VAI_recognizing_039.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_000.png b/clusterApp/Res/image/VAI_speaking_000.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_000.png
rename to clusterApp/Res/image/VAI_speaking_000.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_001.png b/clusterApp/Res/image/VAI_speaking_001.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_001.png
rename to clusterApp/Res/image/VAI_speaking_001.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_002.png b/clusterApp/Res/image/VAI_speaking_002.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_002.png
rename to clusterApp/Res/image/VAI_speaking_002.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_003.png b/clusterApp/Res/image/VAI_speaking_003.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_003.png
rename to clusterApp/Res/image/VAI_speaking_003.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_004.png b/clusterApp/Res/image/VAI_speaking_004.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_004.png
rename to clusterApp/Res/image/VAI_speaking_004.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_005.png b/clusterApp/Res/image/VAI_speaking_005.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_005.png
rename to clusterApp/Res/image/VAI_speaking_005.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_006.png b/clusterApp/Res/image/VAI_speaking_006.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_006.png
rename to clusterApp/Res/image/VAI_speaking_006.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_007.png b/clusterApp/Res/image/VAI_speaking_007.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_007.png
rename to clusterApp/Res/image/VAI_speaking_007.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_008.png b/clusterApp/Res/image/VAI_speaking_008.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_008.png
rename to clusterApp/Res/image/VAI_speaking_008.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_009.png b/clusterApp/Res/image/VAI_speaking_009.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_009.png
rename to clusterApp/Res/image/VAI_speaking_009.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_010.png b/clusterApp/Res/image/VAI_speaking_010.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_010.png
rename to clusterApp/Res/image/VAI_speaking_010.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_011.png b/clusterApp/Res/image/VAI_speaking_011.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_011.png
rename to clusterApp/Res/image/VAI_speaking_011.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_012.png b/clusterApp/Res/image/VAI_speaking_012.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_012.png
rename to clusterApp/Res/image/VAI_speaking_012.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_013.png b/clusterApp/Res/image/VAI_speaking_013.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_013.png
rename to clusterApp/Res/image/VAI_speaking_013.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_014.png b/clusterApp/Res/image/VAI_speaking_014.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_014.png
rename to clusterApp/Res/image/VAI_speaking_014.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_015.png b/clusterApp/Res/image/VAI_speaking_015.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_015.png
rename to clusterApp/Res/image/VAI_speaking_015.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_016.png b/clusterApp/Res/image/VAI_speaking_016.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_016.png
rename to clusterApp/Res/image/VAI_speaking_016.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_017.png b/clusterApp/Res/image/VAI_speaking_017.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_017.png
rename to clusterApp/Res/image/VAI_speaking_017.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_018.png b/clusterApp/Res/image/VAI_speaking_018.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_018.png
rename to clusterApp/Res/image/VAI_speaking_018.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_019.png b/clusterApp/Res/image/VAI_speaking_019.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_019.png
rename to clusterApp/Res/image/VAI_speaking_019.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_020.png b/clusterApp/Res/image/VAI_speaking_020.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_020.png
rename to clusterApp/Res/image/VAI_speaking_020.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_021.png b/clusterApp/Res/image/VAI_speaking_021.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_021.png
rename to clusterApp/Res/image/VAI_speaking_021.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_022.png b/clusterApp/Res/image/VAI_speaking_022.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_022.png
rename to clusterApp/Res/image/VAI_speaking_022.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_023.png b/clusterApp/Res/image/VAI_speaking_023.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_023.png
rename to clusterApp/Res/image/VAI_speaking_023.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_024.png b/clusterApp/Res/image/VAI_speaking_024.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_024.png
rename to clusterApp/Res/image/VAI_speaking_024.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_025.png b/clusterApp/Res/image/VAI_speaking_025.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_025.png
rename to clusterApp/Res/image/VAI_speaking_025.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_026.png b/clusterApp/Res/image/VAI_speaking_026.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_026.png
rename to clusterApp/Res/image/VAI_speaking_026.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_027.png b/clusterApp/Res/image/VAI_speaking_027.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_027.png
rename to clusterApp/Res/image/VAI_speaking_027.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_028.png b/clusterApp/Res/image/VAI_speaking_028.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_028.png
rename to clusterApp/Res/image/VAI_speaking_028.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_029.png b/clusterApp/Res/image/VAI_speaking_029.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_029.png
rename to clusterApp/Res/image/VAI_speaking_029.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_030.png b/clusterApp/Res/image/VAI_speaking_030.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_030.png
rename to clusterApp/Res/image/VAI_speaking_030.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_031.png b/clusterApp/Res/image/VAI_speaking_031.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_031.png
rename to clusterApp/Res/image/VAI_speaking_031.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_032.png b/clusterApp/Res/image/VAI_speaking_032.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_032.png
rename to clusterApp/Res/image/VAI_speaking_032.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_033.png b/clusterApp/Res/image/VAI_speaking_033.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_033.png
rename to clusterApp/Res/image/VAI_speaking_033.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_034.png b/clusterApp/Res/image/VAI_speaking_034.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_034.png
rename to clusterApp/Res/image/VAI_speaking_034.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_035.png b/clusterApp/Res/image/VAI_speaking_035.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_035.png
rename to clusterApp/Res/image/VAI_speaking_035.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_036.png b/clusterApp/Res/image/VAI_speaking_036.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_036.png
rename to clusterApp/Res/image/VAI_speaking_036.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_037.png b/clusterApp/Res/image/VAI_speaking_037.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_037.png
rename to clusterApp/Res/image/VAI_speaking_037.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_038.png b/clusterApp/Res/image/VAI_speaking_038.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_038.png
rename to clusterApp/Res/image/VAI_speaking_038.png
diff --git a/insDavi2.0/Res/image/VAI_speaking_039.png b/clusterApp/Res/image/VAI_speaking_039.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_speaking_039.png
rename to clusterApp/Res/image/VAI_speaking_039.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_000.png b/clusterApp/Res/image/VAI_waiting_000.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_000.png
rename to clusterApp/Res/image/VAI_waiting_000.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_001.png b/clusterApp/Res/image/VAI_waiting_001.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_001.png
rename to clusterApp/Res/image/VAI_waiting_001.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_002.png b/clusterApp/Res/image/VAI_waiting_002.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_002.png
rename to clusterApp/Res/image/VAI_waiting_002.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_003.png b/clusterApp/Res/image/VAI_waiting_003.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_003.png
rename to clusterApp/Res/image/VAI_waiting_003.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_004.png b/clusterApp/Res/image/VAI_waiting_004.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_004.png
rename to clusterApp/Res/image/VAI_waiting_004.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_005.png b/clusterApp/Res/image/VAI_waiting_005.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_005.png
rename to clusterApp/Res/image/VAI_waiting_005.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_006.png b/clusterApp/Res/image/VAI_waiting_006.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_006.png
rename to clusterApp/Res/image/VAI_waiting_006.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_007.png b/clusterApp/Res/image/VAI_waiting_007.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_007.png
rename to clusterApp/Res/image/VAI_waiting_007.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_008.png b/clusterApp/Res/image/VAI_waiting_008.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_008.png
rename to clusterApp/Res/image/VAI_waiting_008.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_009.png b/clusterApp/Res/image/VAI_waiting_009.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_009.png
rename to clusterApp/Res/image/VAI_waiting_009.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_010.png b/clusterApp/Res/image/VAI_waiting_010.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_010.png
rename to clusterApp/Res/image/VAI_waiting_010.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_011.png b/clusterApp/Res/image/VAI_waiting_011.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_011.png
rename to clusterApp/Res/image/VAI_waiting_011.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_012.png b/clusterApp/Res/image/VAI_waiting_012.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_012.png
rename to clusterApp/Res/image/VAI_waiting_012.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_013.png b/clusterApp/Res/image/VAI_waiting_013.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_013.png
rename to clusterApp/Res/image/VAI_waiting_013.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_014.png b/clusterApp/Res/image/VAI_waiting_014.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_014.png
rename to clusterApp/Res/image/VAI_waiting_014.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_015.png b/clusterApp/Res/image/VAI_waiting_015.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_015.png
rename to clusterApp/Res/image/VAI_waiting_015.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_016.png b/clusterApp/Res/image/VAI_waiting_016.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_016.png
rename to clusterApp/Res/image/VAI_waiting_016.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_017.png b/clusterApp/Res/image/VAI_waiting_017.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_017.png
rename to clusterApp/Res/image/VAI_waiting_017.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_018.png b/clusterApp/Res/image/VAI_waiting_018.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_018.png
rename to clusterApp/Res/image/VAI_waiting_018.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_019.png b/clusterApp/Res/image/VAI_waiting_019.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_019.png
rename to clusterApp/Res/image/VAI_waiting_019.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_020.png b/clusterApp/Res/image/VAI_waiting_020.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_020.png
rename to clusterApp/Res/image/VAI_waiting_020.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_021.png b/clusterApp/Res/image/VAI_waiting_021.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_021.png
rename to clusterApp/Res/image/VAI_waiting_021.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_022.png b/clusterApp/Res/image/VAI_waiting_022.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_022.png
rename to clusterApp/Res/image/VAI_waiting_022.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_023.png b/clusterApp/Res/image/VAI_waiting_023.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_023.png
rename to clusterApp/Res/image/VAI_waiting_023.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_024.png b/clusterApp/Res/image/VAI_waiting_024.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_024.png
rename to clusterApp/Res/image/VAI_waiting_024.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_025.png b/clusterApp/Res/image/VAI_waiting_025.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_025.png
rename to clusterApp/Res/image/VAI_waiting_025.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_026.png b/clusterApp/Res/image/VAI_waiting_026.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_026.png
rename to clusterApp/Res/image/VAI_waiting_026.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_027.png b/clusterApp/Res/image/VAI_waiting_027.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_027.png
rename to clusterApp/Res/image/VAI_waiting_027.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_028.png b/clusterApp/Res/image/VAI_waiting_028.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_028.png
rename to clusterApp/Res/image/VAI_waiting_028.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_029.png b/clusterApp/Res/image/VAI_waiting_029.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_029.png
rename to clusterApp/Res/image/VAI_waiting_029.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_030.png b/clusterApp/Res/image/VAI_waiting_030.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_030.png
rename to clusterApp/Res/image/VAI_waiting_030.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_031.png b/clusterApp/Res/image/VAI_waiting_031.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_031.png
rename to clusterApp/Res/image/VAI_waiting_031.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_032.png b/clusterApp/Res/image/VAI_waiting_032.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_032.png
rename to clusterApp/Res/image/VAI_waiting_032.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_033.png b/clusterApp/Res/image/VAI_waiting_033.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_033.png
rename to clusterApp/Res/image/VAI_waiting_033.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_034.png b/clusterApp/Res/image/VAI_waiting_034.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_034.png
rename to clusterApp/Res/image/VAI_waiting_034.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_035.png b/clusterApp/Res/image/VAI_waiting_035.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_035.png
rename to clusterApp/Res/image/VAI_waiting_035.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_036.png b/clusterApp/Res/image/VAI_waiting_036.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_036.png
rename to clusterApp/Res/image/VAI_waiting_036.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_037.png b/clusterApp/Res/image/VAI_waiting_037.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_037.png
rename to clusterApp/Res/image/VAI_waiting_037.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_038.png b/clusterApp/Res/image/VAI_waiting_038.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_038.png
rename to clusterApp/Res/image/VAI_waiting_038.png
diff --git a/insDavi2.0/Res/image/VAI_waiting_039.png b/clusterApp/Res/image/VAI_waiting_039.png
similarity index 100%
rename from insDavi2.0/Res/image/VAI_waiting_039.png
rename to clusterApp/Res/image/VAI_waiting_039.png
diff --git a/insDavi2.0/Res/image/Xmart_hint_1.png b/clusterApp/Res/image/Xmart_hint_1.png
similarity index 100%
rename from insDavi2.0/Res/image/Xmart_hint_1.png
rename to clusterApp/Res/image/Xmart_hint_1.png
diff --git a/insDavi2.0/Res/image/Xmart_hint_2.png b/clusterApp/Res/image/Xmart_hint_2.png
similarity index 100%
rename from insDavi2.0/Res/image/Xmart_hint_2.png
rename to clusterApp/Res/image/Xmart_hint_2.png
diff --git a/insDavi2.0/Res/image/Xmart_loading.png b/clusterApp/Res/image/Xmart_loading.png
similarity index 100%
rename from insDavi2.0/Res/image/Xmart_loading.png
rename to clusterApp/Res/image/Xmart_loading.png
diff --git a/insDavi2.0/Res/image/Xmart_logo.png b/clusterApp/Res/image/Xmart_logo.png
similarity index 100%
rename from insDavi2.0/Res/image/Xmart_logo.png
rename to clusterApp/Res/image/Xmart_logo.png
diff --git a/insDavi2.0/Res/image/Xmart_symbol.png b/clusterApp/Res/image/Xmart_symbol.png
similarity index 100%
rename from insDavi2.0/Res/image/Xmart_symbol.png
rename to clusterApp/Res/image/Xmart_symbol.png
diff --git a/insDavi2.0/Res/image/alarm_ACC_failure.png b/clusterApp/Res/image/alarm_ACC_failure.png
similarity index 100%
rename from insDavi2.0/Res/image/alarm_ACC_failure.png
rename to clusterApp/Res/image/alarm_ACC_failure.png
diff --git a/insDavi2.0/Res/image/alarm_blind_auxiliary_failure.png b/clusterApp/Res/image/alarm_blind_auxiliary_failure.png
similarity index 100%
rename from insDavi2.0/Res/image/alarm_blind_auxiliary_failure.png
rename to clusterApp/Res/image/alarm_blind_auxiliary_failure.png
diff --git a/insDavi2.0/Res/image/alarm_font_collision_failure.png b/clusterApp/Res/image/alarm_font_collision_failure.png
similarity index 100%
rename from insDavi2.0/Res/image/alarm_font_collision_failure.png
rename to clusterApp/Res/image/alarm_font_collision_failure.png
diff --git a/insDavi2.0/Res/image/alarm_lane_warning_failure.png b/clusterApp/Res/image/alarm_lane_warning_failure.png
similarity index 100%
rename from insDavi2.0/Res/image/alarm_lane_warning_failure.png
rename to clusterApp/Res/image/alarm_lane_warning_failure.png
diff --git a/insDavi2.0/Res/image/alarm_rear_auxiliary_failure.png b/clusterApp/Res/image/alarm_rear_auxiliary_failure.png
similarity index 100%
rename from insDavi2.0/Res/image/alarm_rear_auxiliary_failure.png
rename to clusterApp/Res/image/alarm_rear_auxiliary_failure.png
diff --git a/insDavi2.0/Res/image/alert_dialog_background.tga b/clusterApp/Res/image/alert_dialog_background.tga
similarity index 100%
rename from insDavi2.0/Res/image/alert_dialog_background.tga
rename to clusterApp/Res/image/alert_dialog_background.tga
diff --git a/insDavi2.0/Res/image/alert_dialog_cancel.tga b/clusterApp/Res/image/alert_dialog_cancel.tga
similarity index 100%
rename from insDavi2.0/Res/image/alert_dialog_cancel.tga
rename to clusterApp/Res/image/alert_dialog_cancel.tga
diff --git a/insDavi2.0/Res/image/alert_dialog_confirm.tga b/clusterApp/Res/image/alert_dialog_confirm.tga
similarity index 100%
rename from insDavi2.0/Res/image/alert_dialog_confirm.tga
rename to clusterApp/Res/image/alert_dialog_confirm.tga
diff --git a/insDavi2.0/Res/image/alert_dialog_confirm_single.tga b/clusterApp/Res/image/alert_dialog_confirm_single.tga
similarity index 100%
rename from insDavi2.0/Res/image/alert_dialog_confirm_single.tga
rename to clusterApp/Res/image/alert_dialog_confirm_single.tga
diff --git a/insDavi2.0/Res/image/alert_dialog_confirm_single_change.png b/clusterApp/Res/image/alert_dialog_confirm_single_change.png
similarity index 100%
rename from insDavi2.0/Res/image/alert_dialog_confirm_single_change.png
rename to clusterApp/Res/image/alert_dialog_confirm_single_change.png
diff --git a/insDavi2.0/Res/image/alert_dialog_confirm_single_retry.png b/clusterApp/Res/image/alert_dialog_confirm_single_retry.png
similarity index 100%
rename from insDavi2.0/Res/image/alert_dialog_confirm_single_retry.png
rename to clusterApp/Res/image/alert_dialog_confirm_single_retry.png
diff --git a/insDavi2.0/Res/image/alert_simple_background.tga b/clusterApp/Res/image/alert_simple_background.tga
similarity index 100%
rename from insDavi2.0/Res/image/alert_simple_background.tga
rename to clusterApp/Res/image/alert_simple_background.tga
diff --git a/insDavi2.0/Res/image/charge_background_car.png b/clusterApp/Res/image/charge_background_car.png
similarity index 100%
rename from insDavi2.0/Res/image/charge_background_car.png
rename to clusterApp/Res/image/charge_background_car.png
diff --git a/insDavi2.0/Res/image/charge_background_charging.png b/clusterApp/Res/image/charge_background_charging.png
similarity index 100%
rename from insDavi2.0/Res/image/charge_background_charging.png
rename to clusterApp/Res/image/charge_background_charging.png
diff --git a/insDavi2.0/Res/image/charge_background_normal.png b/clusterApp/Res/image/charge_background_normal.png
similarity index 100%
rename from insDavi2.0/Res/image/charge_background_normal.png
rename to clusterApp/Res/image/charge_background_normal.png
diff --git a/insDavi2.0/Res/image/charge_charging.png b/clusterApp/Res/image/charge_charging.png
similarity index 100%
rename from insDavi2.0/Res/image/charge_charging.png
rename to clusterApp/Res/image/charge_charging.png
diff --git a/insDavi2.0/Res/image/charge_charging_background.png b/clusterApp/Res/image/charge_charging_background.png
similarity index 100%
rename from insDavi2.0/Res/image/charge_charging_background.png
rename to clusterApp/Res/image/charge_charging_background.png
diff --git a/insDavi2.0/Res/image/charge_charging_bright.png b/clusterApp/Res/image/charge_charging_bright.png
similarity index 100%
rename from insDavi2.0/Res/image/charge_charging_bright.png
rename to clusterApp/Res/image/charge_charging_bright.png
diff --git a/insDavi2.0/Res/image/charge_charging_progress.png b/clusterApp/Res/image/charge_charging_progress.png
similarity index 100%
rename from insDavi2.0/Res/image/charge_charging_progress.png
rename to clusterApp/Res/image/charge_charging_progress.png
diff --git a/insDavi2.0/Res/image/charge_error.png b/clusterApp/Res/image/charge_error.png
similarity index 100%
rename from insDavi2.0/Res/image/charge_error.png
rename to clusterApp/Res/image/charge_error.png
diff --git a/insDavi2.0/Res/image/charge_full.png b/clusterApp/Res/image/charge_full.png
similarity index 100%
rename from insDavi2.0/Res/image/charge_full.png
rename to clusterApp/Res/image/charge_full.png
diff --git a/insDavi2.0/Res/image/charge_hint_charging.png b/clusterApp/Res/image/charge_hint_charging.png
similarity index 100%
rename from insDavi2.0/Res/image/charge_hint_charging.png
rename to clusterApp/Res/image/charge_hint_charging.png
diff --git a/insDavi2.0/Res/image/charge_hint_contact_maintenance.png b/clusterApp/Res/image/charge_hint_contact_maintenance.png
similarity index 100%
rename from insDavi2.0/Res/image/charge_hint_contact_maintenance.png
rename to clusterApp/Res/image/charge_hint_contact_maintenance.png
diff --git a/insDavi2.0/Res/image/charge_hint_finish.png b/clusterApp/Res/image/charge_hint_finish.png
similarity index 100%
rename from insDavi2.0/Res/image/charge_hint_finish.png
rename to clusterApp/Res/image/charge_hint_finish.png
diff --git a/insDavi2.0/Res/image/charge_hint_pull_gun.png b/clusterApp/Res/image/charge_hint_pull_gun.png
similarity index 100%
rename from insDavi2.0/Res/image/charge_hint_pull_gun.png
rename to clusterApp/Res/image/charge_hint_pull_gun.png
diff --git a/insDavi2.0/Res/image/charge_hint_ready.png b/clusterApp/Res/image/charge_hint_ready.png
similarity index 100%
rename from insDavi2.0/Res/image/charge_hint_ready.png
rename to clusterApp/Res/image/charge_hint_ready.png
diff --git a/insDavi2.0/Res/image/charge_hint_stop.png b/clusterApp/Res/image/charge_hint_stop.png
similarity index 100%
rename from insDavi2.0/Res/image/charge_hint_stop.png
rename to clusterApp/Res/image/charge_hint_stop.png
diff --git a/insDavi2.0/Res/image/charge_number_shadow.png b/clusterApp/Res/image/charge_number_shadow.png
similarity index 100%
rename from insDavi2.0/Res/image/charge_number_shadow.png
rename to clusterApp/Res/image/charge_number_shadow.png
diff --git a/insDavi2.0/Res/image/charge_range_unit_km.png b/clusterApp/Res/image/charge_range_unit_km.png
similarity index 100%
rename from insDavi2.0/Res/image/charge_range_unit_km.png
rename to clusterApp/Res/image/charge_range_unit_km.png
diff --git a/insDavi2.0/Res/image/charge_ready.png b/clusterApp/Res/image/charge_ready.png
similarity index 100%
rename from insDavi2.0/Res/image/charge_ready.png
rename to clusterApp/Res/image/charge_ready.png
diff --git a/insDavi2.0/Res/image/charge_ready_background.png b/clusterApp/Res/image/charge_ready_background.png
similarity index 100%
rename from insDavi2.0/Res/image/charge_ready_background.png
rename to clusterApp/Res/image/charge_ready_background.png
diff --git a/insDavi2.0/Res/image/charge_ready_bright.png b/clusterApp/Res/image/charge_ready_bright.png
similarity index 100%
rename from insDavi2.0/Res/image/charge_ready_bright.png
rename to clusterApp/Res/image/charge_ready_bright.png
diff --git a/insDavi2.0/Res/image/charge_ready_progress.png b/clusterApp/Res/image/charge_ready_progress.png
similarity index 100%
rename from insDavi2.0/Res/image/charge_ready_progress.png
rename to clusterApp/Res/image/charge_ready_progress.png
diff --git a/insDavi2.0/Res/image/charge_status_shadow.png b/clusterApp/Res/image/charge_status_shadow.png
similarity index 100%
rename from insDavi2.0/Res/image/charge_status_shadow.png
rename to clusterApp/Res/image/charge_status_shadow.png
diff --git a/insDavi2.0/Res/image/check_000.png b/clusterApp/Res/image/check_000.png
similarity index 100%
rename from insDavi2.0/Res/image/check_000.png
rename to clusterApp/Res/image/check_000.png
diff --git a/insDavi2.0/Res/image/check_001.png b/clusterApp/Res/image/check_001.png
similarity index 100%
rename from insDavi2.0/Res/image/check_001.png
rename to clusterApp/Res/image/check_001.png
diff --git a/insDavi2.0/Res/image/check_002.png b/clusterApp/Res/image/check_002.png
similarity index 100%
rename from insDavi2.0/Res/image/check_002.png
rename to clusterApp/Res/image/check_002.png
diff --git a/insDavi2.0/Res/image/check_003.png b/clusterApp/Res/image/check_003.png
similarity index 100%
rename from insDavi2.0/Res/image/check_003.png
rename to clusterApp/Res/image/check_003.png
diff --git a/insDavi2.0/Res/image/check_004.png b/clusterApp/Res/image/check_004.png
similarity index 100%
rename from insDavi2.0/Res/image/check_004.png
rename to clusterApp/Res/image/check_004.png
diff --git a/insDavi2.0/Res/image/check_005.png b/clusterApp/Res/image/check_005.png
similarity index 100%
rename from insDavi2.0/Res/image/check_005.png
rename to clusterApp/Res/image/check_005.png
diff --git a/insDavi2.0/Res/image/check_006.png b/clusterApp/Res/image/check_006.png
similarity index 100%
rename from insDavi2.0/Res/image/check_006.png
rename to clusterApp/Res/image/check_006.png
diff --git a/insDavi2.0/Res/image/check_007.png b/clusterApp/Res/image/check_007.png
similarity index 100%
rename from insDavi2.0/Res/image/check_007.png
rename to clusterApp/Res/image/check_007.png
diff --git a/insDavi2.0/Res/image/check_008.png b/clusterApp/Res/image/check_008.png
similarity index 100%
rename from insDavi2.0/Res/image/check_008.png
rename to clusterApp/Res/image/check_008.png
diff --git a/insDavi2.0/Res/image/check_009.png b/clusterApp/Res/image/check_009.png
similarity index 100%
rename from insDavi2.0/Res/image/check_009.png
rename to clusterApp/Res/image/check_009.png
diff --git a/insDavi2.0/Res/image/check_010.png b/clusterApp/Res/image/check_010.png
similarity index 100%
rename from insDavi2.0/Res/image/check_010.png
rename to clusterApp/Res/image/check_010.png
diff --git a/insDavi2.0/Res/image/check_011.png b/clusterApp/Res/image/check_011.png
similarity index 100%
rename from insDavi2.0/Res/image/check_011.png
rename to clusterApp/Res/image/check_011.png
diff --git a/insDavi2.0/Res/image/check_012.png b/clusterApp/Res/image/check_012.png
similarity index 100%
rename from insDavi2.0/Res/image/check_012.png
rename to clusterApp/Res/image/check_012.png
diff --git a/insDavi2.0/Res/image/check_013.png b/clusterApp/Res/image/check_013.png
similarity index 100%
rename from insDavi2.0/Res/image/check_013.png
rename to clusterApp/Res/image/check_013.png
diff --git a/insDavi2.0/Res/image/check_014.png b/clusterApp/Res/image/check_014.png
similarity index 100%
rename from insDavi2.0/Res/image/check_014.png
rename to clusterApp/Res/image/check_014.png
diff --git a/insDavi2.0/Res/image/check_015.png b/clusterApp/Res/image/check_015.png
similarity index 100%
rename from insDavi2.0/Res/image/check_015.png
rename to clusterApp/Res/image/check_015.png
diff --git a/insDavi2.0/Res/image/check_016.png b/clusterApp/Res/image/check_016.png
similarity index 100%
rename from insDavi2.0/Res/image/check_016.png
rename to clusterApp/Res/image/check_016.png
diff --git a/insDavi2.0/Res/image/check_017.png b/clusterApp/Res/image/check_017.png
similarity index 100%
rename from insDavi2.0/Res/image/check_017.png
rename to clusterApp/Res/image/check_017.png
diff --git a/insDavi2.0/Res/image/check_018.png b/clusterApp/Res/image/check_018.png
similarity index 100%
rename from insDavi2.0/Res/image/check_018.png
rename to clusterApp/Res/image/check_018.png
diff --git a/insDavi2.0/Res/image/check_019.png b/clusterApp/Res/image/check_019.png
similarity index 100%
rename from insDavi2.0/Res/image/check_019.png
rename to clusterApp/Res/image/check_019.png
diff --git a/insDavi2.0/Res/image/check_020.png b/clusterApp/Res/image/check_020.png
similarity index 100%
rename from insDavi2.0/Res/image/check_020.png
rename to clusterApp/Res/image/check_020.png
diff --git a/insDavi2.0/Res/image/check_021.png b/clusterApp/Res/image/check_021.png
similarity index 100%
rename from insDavi2.0/Res/image/check_021.png
rename to clusterApp/Res/image/check_021.png
diff --git a/insDavi2.0/Res/image/check_022.png b/clusterApp/Res/image/check_022.png
similarity index 100%
rename from insDavi2.0/Res/image/check_022.png
rename to clusterApp/Res/image/check_022.png
diff --git a/insDavi2.0/Res/image/check_023.png b/clusterApp/Res/image/check_023.png
similarity index 100%
rename from insDavi2.0/Res/image/check_023.png
rename to clusterApp/Res/image/check_023.png
diff --git a/insDavi2.0/Res/image/check_024.png b/clusterApp/Res/image/check_024.png
similarity index 100%
rename from insDavi2.0/Res/image/check_024.png
rename to clusterApp/Res/image/check_024.png
diff --git a/insDavi2.0/Res/image/check_025.png b/clusterApp/Res/image/check_025.png
similarity index 100%
rename from insDavi2.0/Res/image/check_025.png
rename to clusterApp/Res/image/check_025.png
diff --git a/insDavi2.0/Res/image/check_026.png b/clusterApp/Res/image/check_026.png
similarity index 100%
rename from insDavi2.0/Res/image/check_026.png
rename to clusterApp/Res/image/check_026.png
diff --git a/insDavi2.0/Res/image/check_027.png b/clusterApp/Res/image/check_027.png
similarity index 100%
rename from insDavi2.0/Res/image/check_027.png
rename to clusterApp/Res/image/check_027.png
diff --git a/insDavi2.0/Res/image/check_028.png b/clusterApp/Res/image/check_028.png
similarity index 100%
rename from insDavi2.0/Res/image/check_028.png
rename to clusterApp/Res/image/check_028.png
diff --git a/insDavi2.0/Res/image/check_029.png b/clusterApp/Res/image/check_029.png
similarity index 100%
rename from insDavi2.0/Res/image/check_029.png
rename to clusterApp/Res/image/check_029.png
diff --git a/insDavi2.0/Res/image/check_030.png b/clusterApp/Res/image/check_030.png
similarity index 100%
rename from insDavi2.0/Res/image/check_030.png
rename to clusterApp/Res/image/check_030.png
diff --git a/insDavi2.0/Res/image/check_031.png b/clusterApp/Res/image/check_031.png
similarity index 100%
rename from insDavi2.0/Res/image/check_031.png
rename to clusterApp/Res/image/check_031.png
diff --git a/insDavi2.0/Res/image/check_032.png b/clusterApp/Res/image/check_032.png
similarity index 100%
rename from insDavi2.0/Res/image/check_032.png
rename to clusterApp/Res/image/check_032.png
diff --git a/insDavi2.0/Res/image/check_033.png b/clusterApp/Res/image/check_033.png
similarity index 100%
rename from insDavi2.0/Res/image/check_033.png
rename to clusterApp/Res/image/check_033.png
diff --git a/insDavi2.0/Res/image/check_034.png b/clusterApp/Res/image/check_034.png
similarity index 100%
rename from insDavi2.0/Res/image/check_034.png
rename to clusterApp/Res/image/check_034.png
diff --git a/insDavi2.0/Res/image/check_035.png b/clusterApp/Res/image/check_035.png
similarity index 100%
rename from insDavi2.0/Res/image/check_035.png
rename to clusterApp/Res/image/check_035.png
diff --git a/insDavi2.0/Res/image/check_036.png b/clusterApp/Res/image/check_036.png
similarity index 100%
rename from insDavi2.0/Res/image/check_036.png
rename to clusterApp/Res/image/check_036.png
diff --git a/insDavi2.0/Res/image/check_037.png b/clusterApp/Res/image/check_037.png
similarity index 100%
rename from insDavi2.0/Res/image/check_037.png
rename to clusterApp/Res/image/check_037.png
diff --git a/insDavi2.0/Res/image/check_038.png b/clusterApp/Res/image/check_038.png
similarity index 100%
rename from insDavi2.0/Res/image/check_038.png
rename to clusterApp/Res/image/check_038.png
diff --git a/insDavi2.0/Res/image/check_039.png b/clusterApp/Res/image/check_039.png
similarity index 100%
rename from insDavi2.0/Res/image/check_039.png
rename to clusterApp/Res/image/check_039.png
diff --git a/insDavi2.0/Res/image/check_040.png b/clusterApp/Res/image/check_040.png
similarity index 100%
rename from insDavi2.0/Res/image/check_040.png
rename to clusterApp/Res/image/check_040.png
diff --git a/insDavi2.0/Res/image/check_041.png b/clusterApp/Res/image/check_041.png
similarity index 100%
rename from insDavi2.0/Res/image/check_041.png
rename to clusterApp/Res/image/check_041.png
diff --git a/insDavi2.0/Res/image/check_042.png b/clusterApp/Res/image/check_042.png
similarity index 100%
rename from insDavi2.0/Res/image/check_042.png
rename to clusterApp/Res/image/check_042.png
diff --git a/insDavi2.0/Res/image/check_043.png b/clusterApp/Res/image/check_043.png
similarity index 100%
rename from insDavi2.0/Res/image/check_043.png
rename to clusterApp/Res/image/check_043.png
diff --git a/insDavi2.0/Res/image/check_044.png b/clusterApp/Res/image/check_044.png
similarity index 100%
rename from insDavi2.0/Res/image/check_044.png
rename to clusterApp/Res/image/check_044.png
diff --git a/insDavi2.0/Res/image/check_045.png b/clusterApp/Res/image/check_045.png
similarity index 100%
rename from insDavi2.0/Res/image/check_045.png
rename to clusterApp/Res/image/check_045.png
diff --git a/insDavi2.0/Res/image/check_046.png b/clusterApp/Res/image/check_046.png
similarity index 100%
rename from insDavi2.0/Res/image/check_046.png
rename to clusterApp/Res/image/check_046.png
diff --git a/insDavi2.0/Res/image/check_047.png b/clusterApp/Res/image/check_047.png
similarity index 100%
rename from insDavi2.0/Res/image/check_047.png
rename to clusterApp/Res/image/check_047.png
diff --git a/insDavi2.0/Res/image/check_048.png b/clusterApp/Res/image/check_048.png
similarity index 100%
rename from insDavi2.0/Res/image/check_048.png
rename to clusterApp/Res/image/check_048.png
diff --git a/insDavi2.0/Res/image/check_049.png b/clusterApp/Res/image/check_049.png
similarity index 100%
rename from insDavi2.0/Res/image/check_049.png
rename to clusterApp/Res/image/check_049.png
diff --git a/insDavi2.0/Res/image/check_050.png b/clusterApp/Res/image/check_050.png
similarity index 100%
rename from insDavi2.0/Res/image/check_050.png
rename to clusterApp/Res/image/check_050.png
diff --git a/insDavi2.0/Res/image/check_051.png b/clusterApp/Res/image/check_051.png
similarity index 100%
rename from insDavi2.0/Res/image/check_051.png
rename to clusterApp/Res/image/check_051.png
diff --git a/insDavi2.0/Res/image/check_052.png b/clusterApp/Res/image/check_052.png
similarity index 100%
rename from insDavi2.0/Res/image/check_052.png
rename to clusterApp/Res/image/check_052.png
diff --git a/insDavi2.0/Res/image/check_053.png b/clusterApp/Res/image/check_053.png
similarity index 100%
rename from insDavi2.0/Res/image/check_053.png
rename to clusterApp/Res/image/check_053.png
diff --git a/insDavi2.0/Res/image/check_054.png b/clusterApp/Res/image/check_054.png
similarity index 100%
rename from insDavi2.0/Res/image/check_054.png
rename to clusterApp/Res/image/check_054.png
diff --git a/insDavi2.0/Res/image/check_055.png b/clusterApp/Res/image/check_055.png
similarity index 100%
rename from insDavi2.0/Res/image/check_055.png
rename to clusterApp/Res/image/check_055.png
diff --git a/insDavi2.0/Res/image/check_056.png b/clusterApp/Res/image/check_056.png
similarity index 100%
rename from insDavi2.0/Res/image/check_056.png
rename to clusterApp/Res/image/check_056.png
diff --git a/insDavi2.0/Res/image/check_057.png b/clusterApp/Res/image/check_057.png
similarity index 100%
rename from insDavi2.0/Res/image/check_057.png
rename to clusterApp/Res/image/check_057.png
diff --git a/insDavi2.0/Res/image/check_058.png b/clusterApp/Res/image/check_058.png
similarity index 100%
rename from insDavi2.0/Res/image/check_058.png
rename to clusterApp/Res/image/check_058.png
diff --git a/insDavi2.0/Res/image/check_059.png b/clusterApp/Res/image/check_059.png
similarity index 100%
rename from insDavi2.0/Res/image/check_059.png
rename to clusterApp/Res/image/check_059.png
diff --git a/insDavi2.0/Res/image/check_060.png b/clusterApp/Res/image/check_060.png
similarity index 100%
rename from insDavi2.0/Res/image/check_060.png
rename to clusterApp/Res/image/check_060.png
diff --git a/insDavi2.0/Res/image/check_061.png b/clusterApp/Res/image/check_061.png
similarity index 100%
rename from insDavi2.0/Res/image/check_061.png
rename to clusterApp/Res/image/check_061.png
diff --git a/insDavi2.0/Res/image/check_062.png b/clusterApp/Res/image/check_062.png
similarity index 100%
rename from insDavi2.0/Res/image/check_062.png
rename to clusterApp/Res/image/check_062.png
diff --git a/insDavi2.0/Res/image/check_063.png b/clusterApp/Res/image/check_063.png
similarity index 100%
rename from insDavi2.0/Res/image/check_063.png
rename to clusterApp/Res/image/check_063.png
diff --git a/insDavi2.0/Res/image/check_064.png b/clusterApp/Res/image/check_064.png
similarity index 100%
rename from insDavi2.0/Res/image/check_064.png
rename to clusterApp/Res/image/check_064.png
diff --git a/insDavi2.0/Res/image/check_065.png b/clusterApp/Res/image/check_065.png
similarity index 100%
rename from insDavi2.0/Res/image/check_065.png
rename to clusterApp/Res/image/check_065.png
diff --git a/insDavi2.0/Res/image/check_066.png b/clusterApp/Res/image/check_066.png
similarity index 100%
rename from insDavi2.0/Res/image/check_066.png
rename to clusterApp/Res/image/check_066.png
diff --git a/insDavi2.0/Res/image/check_067.png b/clusterApp/Res/image/check_067.png
similarity index 100%
rename from insDavi2.0/Res/image/check_067.png
rename to clusterApp/Res/image/check_067.png
diff --git a/insDavi2.0/Res/image/check_068.png b/clusterApp/Res/image/check_068.png
similarity index 100%
rename from insDavi2.0/Res/image/check_068.png
rename to clusterApp/Res/image/check_068.png
diff --git a/insDavi2.0/Res/image/check_069.png b/clusterApp/Res/image/check_069.png
similarity index 100%
rename from insDavi2.0/Res/image/check_069.png
rename to clusterApp/Res/image/check_069.png
diff --git a/insDavi2.0/Res/image/check_070.png b/clusterApp/Res/image/check_070.png
similarity index 100%
rename from insDavi2.0/Res/image/check_070.png
rename to clusterApp/Res/image/check_070.png
diff --git a/insDavi2.0/Res/image/check_071.png b/clusterApp/Res/image/check_071.png
similarity index 100%
rename from insDavi2.0/Res/image/check_071.png
rename to clusterApp/Res/image/check_071.png
diff --git a/insDavi2.0/Res/image/check_072.png b/clusterApp/Res/image/check_072.png
similarity index 100%
rename from insDavi2.0/Res/image/check_072.png
rename to clusterApp/Res/image/check_072.png
diff --git a/insDavi2.0/Res/image/check_073.png b/clusterApp/Res/image/check_073.png
similarity index 100%
rename from insDavi2.0/Res/image/check_073.png
rename to clusterApp/Res/image/check_073.png
diff --git a/insDavi2.0/Res/image/check_074.png b/clusterApp/Res/image/check_074.png
similarity index 100%
rename from insDavi2.0/Res/image/check_074.png
rename to clusterApp/Res/image/check_074.png
diff --git a/insDavi2.0/Res/image/check_075.png b/clusterApp/Res/image/check_075.png
similarity index 100%
rename from insDavi2.0/Res/image/check_075.png
rename to clusterApp/Res/image/check_075.png
diff --git a/insDavi2.0/Res/image/check_076.png b/clusterApp/Res/image/check_076.png
similarity index 100%
rename from insDavi2.0/Res/image/check_076.png
rename to clusterApp/Res/image/check_076.png
diff --git a/insDavi2.0/Res/image/check_077.png b/clusterApp/Res/image/check_077.png
similarity index 100%
rename from insDavi2.0/Res/image/check_077.png
rename to clusterApp/Res/image/check_077.png
diff --git a/insDavi2.0/Res/image/check_078.png b/clusterApp/Res/image/check_078.png
similarity index 100%
rename from insDavi2.0/Res/image/check_078.png
rename to clusterApp/Res/image/check_078.png
diff --git a/insDavi2.0/Res/image/check_079.png b/clusterApp/Res/image/check_079.png
similarity index 100%
rename from insDavi2.0/Res/image/check_079.png
rename to clusterApp/Res/image/check_079.png
diff --git a/insDavi2.0/Res/image/check_080.png b/clusterApp/Res/image/check_080.png
similarity index 100%
rename from insDavi2.0/Res/image/check_080.png
rename to clusterApp/Res/image/check_080.png
diff --git a/insDavi2.0/Res/image/check_081.png b/clusterApp/Res/image/check_081.png
similarity index 100%
rename from insDavi2.0/Res/image/check_081.png
rename to clusterApp/Res/image/check_081.png
diff --git a/insDavi2.0/Res/image/check_082.png b/clusterApp/Res/image/check_082.png
similarity index 100%
rename from insDavi2.0/Res/image/check_082.png
rename to clusterApp/Res/image/check_082.png
diff --git a/insDavi2.0/Res/image/check_083.png b/clusterApp/Res/image/check_083.png
similarity index 100%
rename from insDavi2.0/Res/image/check_083.png
rename to clusterApp/Res/image/check_083.png
diff --git a/insDavi2.0/Res/image/check_084.png b/clusterApp/Res/image/check_084.png
similarity index 100%
rename from insDavi2.0/Res/image/check_084.png
rename to clusterApp/Res/image/check_084.png
diff --git a/insDavi2.0/Res/image/check_085.png b/clusterApp/Res/image/check_085.png
similarity index 100%
rename from insDavi2.0/Res/image/check_085.png
rename to clusterApp/Res/image/check_085.png
diff --git a/insDavi2.0/Res/image/check_086.png b/clusterApp/Res/image/check_086.png
similarity index 100%
rename from insDavi2.0/Res/image/check_086.png
rename to clusterApp/Res/image/check_086.png
diff --git a/insDavi2.0/Res/image/check_087.png b/clusterApp/Res/image/check_087.png
similarity index 100%
rename from insDavi2.0/Res/image/check_087.png
rename to clusterApp/Res/image/check_087.png
diff --git a/insDavi2.0/Res/image/check_088.png b/clusterApp/Res/image/check_088.png
similarity index 100%
rename from insDavi2.0/Res/image/check_088.png
rename to clusterApp/Res/image/check_088.png
diff --git a/insDavi2.0/Res/image/check_089.png b/clusterApp/Res/image/check_089.png
similarity index 100%
rename from insDavi2.0/Res/image/check_089.png
rename to clusterApp/Res/image/check_089.png
diff --git a/insDavi2.0/Res/image/check_090.png b/clusterApp/Res/image/check_090.png
similarity index 100%
rename from insDavi2.0/Res/image/check_090.png
rename to clusterApp/Res/image/check_090.png
diff --git a/insDavi2.0/Res/image/check_091.png b/clusterApp/Res/image/check_091.png
similarity index 100%
rename from insDavi2.0/Res/image/check_091.png
rename to clusterApp/Res/image/check_091.png
diff --git a/insDavi2.0/Res/image/check_092.png b/clusterApp/Res/image/check_092.png
similarity index 100%
rename from insDavi2.0/Res/image/check_092.png
rename to clusterApp/Res/image/check_092.png
diff --git a/insDavi2.0/Res/image/check_background.png b/clusterApp/Res/image/check_background.png
similarity index 100%
rename from insDavi2.0/Res/image/check_background.png
rename to clusterApp/Res/image/check_background.png
diff --git a/insDavi2.0/Res/image/cruise_arrow.tga b/clusterApp/Res/image/cruise_arrow.tga
similarity index 100%
rename from insDavi2.0/Res/image/cruise_arrow.tga
rename to clusterApp/Res/image/cruise_arrow.tga
diff --git a/insDavi2.0/Res/image/cruise_pointer_blue.tga b/clusterApp/Res/image/cruise_pointer_blue.tga
similarity index 100%
rename from insDavi2.0/Res/image/cruise_pointer_blue.tga
rename to clusterApp/Res/image/cruise_pointer_blue.tga
diff --git a/insDavi2.0/Res/image/cruise_scale_disk_blue.tga b/clusterApp/Res/image/cruise_scale_disk_blue.tga
similarity index 100%
rename from insDavi2.0/Res/image/cruise_scale_disk_blue.tga
rename to clusterApp/Res/image/cruise_scale_disk_blue.tga
diff --git a/insDavi2.0/Res/image/driving_car_all_blue_base.png b/clusterApp/Res/image/driving_car_all_blue_base.png
similarity index 100%
rename from insDavi2.0/Res/image/driving_car_all_blue_base.png
rename to clusterApp/Res/image/driving_car_all_blue_base.png
diff --git a/insDavi2.0/Res/image/driving_car_all_blue_camera.png b/clusterApp/Res/image/driving_car_all_blue_camera.png
similarity index 100%
rename from insDavi2.0/Res/image/driving_car_all_blue_camera.png
rename to clusterApp/Res/image/driving_car_all_blue_camera.png
diff --git a/insDavi2.0/Res/image/driving_car_all_gray_base.png b/clusterApp/Res/image/driving_car_all_gray_base.png
similarity index 100%
rename from insDavi2.0/Res/image/driving_car_all_gray_base.png
rename to clusterApp/Res/image/driving_car_all_gray_base.png
diff --git a/insDavi2.0/Res/image/driving_car_all_gray_camera.png b/clusterApp/Res/image/driving_car_all_gray_camera.png
similarity index 100%
rename from insDavi2.0/Res/image/driving_car_all_gray_camera.png
rename to clusterApp/Res/image/driving_car_all_gray_camera.png
diff --git a/insDavi2.0/Res/image/driving_car_all_red_base.png b/clusterApp/Res/image/driving_car_all_red_base.png
similarity index 100%
rename from insDavi2.0/Res/image/driving_car_all_red_base.png
rename to clusterApp/Res/image/driving_car_all_red_base.png
diff --git a/insDavi2.0/Res/image/driving_car_all_red_camera.png b/clusterApp/Res/image/driving_car_all_red_camera.png
similarity index 100%
rename from insDavi2.0/Res/image/driving_car_all_red_camera.png
rename to clusterApp/Res/image/driving_car_all_red_camera.png
diff --git a/insDavi2.0/Res/image/driving_car_blue_base.png b/clusterApp/Res/image/driving_car_blue_base.png
similarity index 100%
rename from insDavi2.0/Res/image/driving_car_blue_base.png
rename to clusterApp/Res/image/driving_car_blue_base.png
diff --git a/insDavi2.0/Res/image/driving_car_blue_camera.png b/clusterApp/Res/image/driving_car_blue_camera.png
similarity index 100%
rename from insDavi2.0/Res/image/driving_car_blue_camera.png
rename to clusterApp/Res/image/driving_car_blue_camera.png
diff --git a/insDavi2.0/Res/image/driving_car_darkgray_base.png b/clusterApp/Res/image/driving_car_darkgray_base.png
similarity index 100%
rename from insDavi2.0/Res/image/driving_car_darkgray_base.png
rename to clusterApp/Res/image/driving_car_darkgray_base.png
diff --git a/insDavi2.0/Res/image/driving_car_darkgray_camera.png b/clusterApp/Res/image/driving_car_darkgray_camera.png
similarity index 100%
rename from insDavi2.0/Res/image/driving_car_darkgray_camera.png
rename to clusterApp/Res/image/driving_car_darkgray_camera.png
diff --git a/insDavi2.0/Res/image/driving_car_gray_base.png b/clusterApp/Res/image/driving_car_gray_base.png
similarity index 100%
rename from insDavi2.0/Res/image/driving_car_gray_base.png
rename to clusterApp/Res/image/driving_car_gray_base.png
diff --git a/insDavi2.0/Res/image/driving_car_gray_camera.png b/clusterApp/Res/image/driving_car_gray_camera.png
similarity index 100%
rename from insDavi2.0/Res/image/driving_car_gray_camera.png
rename to clusterApp/Res/image/driving_car_gray_camera.png
diff --git a/insDavi2.0/Res/image/driving_car_mattgray_base.png b/clusterApp/Res/image/driving_car_mattgray_base.png
similarity index 100%
rename from insDavi2.0/Res/image/driving_car_mattgray_base.png
rename to clusterApp/Res/image/driving_car_mattgray_base.png
diff --git a/insDavi2.0/Res/image/driving_car_mattgray_camera.png b/clusterApp/Res/image/driving_car_mattgray_camera.png
similarity index 100%
rename from insDavi2.0/Res/image/driving_car_mattgray_camera.png
rename to clusterApp/Res/image/driving_car_mattgray_camera.png
diff --git a/insDavi2.0/Res/image/driving_car_red_base.png b/clusterApp/Res/image/driving_car_red_base.png
similarity index 100%
rename from insDavi2.0/Res/image/driving_car_red_base.png
rename to clusterApp/Res/image/driving_car_red_base.png
diff --git a/insDavi2.0/Res/image/driving_car_red_camera.png b/clusterApp/Res/image/driving_car_red_camera.png
similarity index 100%
rename from insDavi2.0/Res/image/driving_car_red_camera.png
rename to clusterApp/Res/image/driving_car_red_camera.png
diff --git a/insDavi2.0/Res/image/driving_car_skyblue_base.png b/clusterApp/Res/image/driving_car_skyblue_base.png
similarity index 100%
rename from insDavi2.0/Res/image/driving_car_skyblue_base.png
rename to clusterApp/Res/image/driving_car_skyblue_base.png
diff --git a/insDavi2.0/Res/image/driving_car_skyblue_camera.png b/clusterApp/Res/image/driving_car_skyblue_camera.png
similarity index 100%
rename from insDavi2.0/Res/image/driving_car_skyblue_camera.png
rename to clusterApp/Res/image/driving_car_skyblue_camera.png
diff --git a/insDavi2.0/Res/image/driving_car_tail_lamp_brake.png b/clusterApp/Res/image/driving_car_tail_lamp_brake.png
similarity index 100%
rename from insDavi2.0/Res/image/driving_car_tail_lamp_brake.png
rename to clusterApp/Res/image/driving_car_tail_lamp_brake.png
diff --git a/insDavi2.0/Res/image/driving_car_tail_lamp_fog.png b/clusterApp/Res/image/driving_car_tail_lamp_fog.png
similarity index 100%
rename from insDavi2.0/Res/image/driving_car_tail_lamp_fog.png
rename to clusterApp/Res/image/driving_car_tail_lamp_fog.png
diff --git a/insDavi2.0/Res/image/driving_car_tail_lamp_left.png b/clusterApp/Res/image/driving_car_tail_lamp_left.png
similarity index 100%
rename from insDavi2.0/Res/image/driving_car_tail_lamp_left.png
rename to clusterApp/Res/image/driving_car_tail_lamp_left.png
diff --git a/insDavi2.0/Res/image/driving_car_tail_lamp_off.png b/clusterApp/Res/image/driving_car_tail_lamp_off.png
similarity index 100%
rename from insDavi2.0/Res/image/driving_car_tail_lamp_off.png
rename to clusterApp/Res/image/driving_car_tail_lamp_off.png
diff --git a/insDavi2.0/Res/image/driving_car_tail_lamp_position.png b/clusterApp/Res/image/driving_car_tail_lamp_position.png
similarity index 100%
rename from insDavi2.0/Res/image/driving_car_tail_lamp_position.png
rename to clusterApp/Res/image/driving_car_tail_lamp_position.png
diff --git a/insDavi2.0/Res/image/driving_car_tail_lamp_right.png b/clusterApp/Res/image/driving_car_tail_lamp_right.png
similarity index 100%
rename from insDavi2.0/Res/image/driving_car_tail_lamp_right.png
rename to clusterApp/Res/image/driving_car_tail_lamp_right.png
diff --git a/insDavi2.0/Res/image/driving_car_tail_shelter.png b/clusterApp/Res/image/driving_car_tail_shelter.png
similarity index 100%
rename from insDavi2.0/Res/image/driving_car_tail_shelter.png
rename to clusterApp/Res/image/driving_car_tail_shelter.png
diff --git a/insDavi2.0/Res/image/driving_car_white_base.png b/clusterApp/Res/image/driving_car_white_base.png
similarity index 100%
rename from insDavi2.0/Res/image/driving_car_white_base.png
rename to clusterApp/Res/image/driving_car_white_base.png
diff --git a/insDavi2.0/Res/image/driving_car_white_camera.png b/clusterApp/Res/image/driving_car_white_camera.png
similarity index 100%
rename from insDavi2.0/Res/image/driving_car_white_camera.png
rename to clusterApp/Res/image/driving_car_white_camera.png
diff --git a/insDavi2.0/Res/image/driving_high_beam.png b/clusterApp/Res/image/driving_high_beam.png
similarity index 100%
rename from insDavi2.0/Res/image/driving_high_beam.png
rename to clusterApp/Res/image/driving_high_beam.png
diff --git a/insDavi2.0/Res/image/driving_high_beam.tga b/clusterApp/Res/image/driving_high_beam.tga
similarity index 100%
rename from insDavi2.0/Res/image/driving_high_beam.tga
rename to clusterApp/Res/image/driving_high_beam.tga
diff --git a/insDavi2.0/Res/image/driving_low_beam.png b/clusterApp/Res/image/driving_low_beam.png
similarity index 100%
rename from insDavi2.0/Res/image/driving_low_beam.png
rename to clusterApp/Res/image/driving_low_beam.png
diff --git a/insDavi2.0/Res/image/driving_low_beam.tga b/clusterApp/Res/image/driving_low_beam.tga
similarity index 100%
rename from insDavi2.0/Res/image/driving_low_beam.tga
rename to clusterApp/Res/image/driving_low_beam.tga
diff --git a/insDavi2.0/Res/image/driving_white_body.tga b/clusterApp/Res/image/driving_white_body.tga
similarity index 100%
rename from insDavi2.0/Res/image/driving_white_body.tga
rename to clusterApp/Res/image/driving_white_body.tga
diff --git a/insDavi2.0/Res/image/driving_white_led_brake.tga b/clusterApp/Res/image/driving_white_led_brake.tga
similarity index 100%
rename from insDavi2.0/Res/image/driving_white_led_brake.tga
rename to clusterApp/Res/image/driving_white_led_brake.tga
diff --git a/insDavi2.0/Res/image/driving_white_led_off.tga b/clusterApp/Res/image/driving_white_led_off.tga
similarity index 100%
rename from insDavi2.0/Res/image/driving_white_led_off.tga
rename to clusterApp/Res/image/driving_white_led_off.tga
diff --git a/insDavi2.0/Res/image/driving_white_led_position.tga b/clusterApp/Res/image/driving_white_led_position.tga
similarity index 100%
rename from insDavi2.0/Res/image/driving_white_led_position.tga
rename to clusterApp/Res/image/driving_white_led_position.tga
diff --git a/insDavi2.0/Res/image/driving_white_led_turn_left.tga b/clusterApp/Res/image/driving_white_led_turn_left.tga
similarity index 100%
rename from insDavi2.0/Res/image/driving_white_led_turn_left.tga
rename to clusterApp/Res/image/driving_white_led_turn_left.tga
diff --git a/insDavi2.0/Res/image/driving_white_led_turn_right.tga b/clusterApp/Res/image/driving_white_led_turn_right.tga
similarity index 100%
rename from insDavi2.0/Res/image/driving_white_led_turn_right.tga
rename to clusterApp/Res/image/driving_white_led_turn_right.tga
diff --git a/insDavi2.0/Res/image/eco-720_031.png b/clusterApp/Res/image/eco-720_031.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_031.png
rename to clusterApp/Res/image/eco-720_031.png
diff --git a/insDavi2.0/Res/image/eco-720_032.png b/clusterApp/Res/image/eco-720_032.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_032.png
rename to clusterApp/Res/image/eco-720_032.png
diff --git a/insDavi2.0/Res/image/eco-720_033.png b/clusterApp/Res/image/eco-720_033.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_033.png
rename to clusterApp/Res/image/eco-720_033.png
diff --git a/insDavi2.0/Res/image/eco-720_034.png b/clusterApp/Res/image/eco-720_034.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_034.png
rename to clusterApp/Res/image/eco-720_034.png
diff --git a/insDavi2.0/Res/image/eco-720_035.png b/clusterApp/Res/image/eco-720_035.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_035.png
rename to clusterApp/Res/image/eco-720_035.png
diff --git a/insDavi2.0/Res/image/eco-720_036.png b/clusterApp/Res/image/eco-720_036.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_036.png
rename to clusterApp/Res/image/eco-720_036.png
diff --git a/insDavi2.0/Res/image/eco-720_037.png b/clusterApp/Res/image/eco-720_037.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_037.png
rename to clusterApp/Res/image/eco-720_037.png
diff --git a/insDavi2.0/Res/image/eco-720_038.png b/clusterApp/Res/image/eco-720_038.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_038.png
rename to clusterApp/Res/image/eco-720_038.png
diff --git a/insDavi2.0/Res/image/eco-720_039.png b/clusterApp/Res/image/eco-720_039.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_039.png
rename to clusterApp/Res/image/eco-720_039.png
diff --git a/insDavi2.0/Res/image/eco-720_040.png b/clusterApp/Res/image/eco-720_040.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_040.png
rename to clusterApp/Res/image/eco-720_040.png
diff --git a/insDavi2.0/Res/image/eco-720_041.png b/clusterApp/Res/image/eco-720_041.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_041.png
rename to clusterApp/Res/image/eco-720_041.png
diff --git a/insDavi2.0/Res/image/eco-720_042.png b/clusterApp/Res/image/eco-720_042.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_042.png
rename to clusterApp/Res/image/eco-720_042.png
diff --git a/insDavi2.0/Res/image/eco-720_043.png b/clusterApp/Res/image/eco-720_043.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_043.png
rename to clusterApp/Res/image/eco-720_043.png
diff --git a/insDavi2.0/Res/image/eco-720_044.png b/clusterApp/Res/image/eco-720_044.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_044.png
rename to clusterApp/Res/image/eco-720_044.png
diff --git a/insDavi2.0/Res/image/eco-720_045.png b/clusterApp/Res/image/eco-720_045.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_045.png
rename to clusterApp/Res/image/eco-720_045.png
diff --git a/insDavi2.0/Res/image/eco-720_046.png b/clusterApp/Res/image/eco-720_046.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_046.png
rename to clusterApp/Res/image/eco-720_046.png
diff --git a/insDavi2.0/Res/image/eco-720_047.png b/clusterApp/Res/image/eco-720_047.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_047.png
rename to clusterApp/Res/image/eco-720_047.png
diff --git a/insDavi2.0/Res/image/eco-720_048.png b/clusterApp/Res/image/eco-720_048.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_048.png
rename to clusterApp/Res/image/eco-720_048.png
diff --git a/insDavi2.0/Res/image/eco-720_049.png b/clusterApp/Res/image/eco-720_049.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_049.png
rename to clusterApp/Res/image/eco-720_049.png
diff --git a/insDavi2.0/Res/image/eco-720_050.png b/clusterApp/Res/image/eco-720_050.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_050.png
rename to clusterApp/Res/image/eco-720_050.png
diff --git a/insDavi2.0/Res/image/eco-720_051.png b/clusterApp/Res/image/eco-720_051.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_051.png
rename to clusterApp/Res/image/eco-720_051.png
diff --git a/insDavi2.0/Res/image/eco-720_052.png b/clusterApp/Res/image/eco-720_052.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_052.png
rename to clusterApp/Res/image/eco-720_052.png
diff --git a/insDavi2.0/Res/image/eco-720_053.png b/clusterApp/Res/image/eco-720_053.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_053.png
rename to clusterApp/Res/image/eco-720_053.png
diff --git a/insDavi2.0/Res/image/eco-720_054.png b/clusterApp/Res/image/eco-720_054.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_054.png
rename to clusterApp/Res/image/eco-720_054.png
diff --git a/insDavi2.0/Res/image/eco-720_055.png b/clusterApp/Res/image/eco-720_055.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_055.png
rename to clusterApp/Res/image/eco-720_055.png
diff --git a/insDavi2.0/Res/image/eco-720_056.png b/clusterApp/Res/image/eco-720_056.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_056.png
rename to clusterApp/Res/image/eco-720_056.png
diff --git a/insDavi2.0/Res/image/eco-720_057.png b/clusterApp/Res/image/eco-720_057.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_057.png
rename to clusterApp/Res/image/eco-720_057.png
diff --git a/insDavi2.0/Res/image/eco-720_058.png b/clusterApp/Res/image/eco-720_058.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_058.png
rename to clusterApp/Res/image/eco-720_058.png
diff --git a/insDavi2.0/Res/image/eco-720_059.png b/clusterApp/Res/image/eco-720_059.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_059.png
rename to clusterApp/Res/image/eco-720_059.png
diff --git a/insDavi2.0/Res/image/eco-720_060.png b/clusterApp/Res/image/eco-720_060.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_060.png
rename to clusterApp/Res/image/eco-720_060.png
diff --git a/insDavi2.0/Res/image/eco-720_061.png b/clusterApp/Res/image/eco-720_061.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_061.png
rename to clusterApp/Res/image/eco-720_061.png
diff --git a/insDavi2.0/Res/image/eco-720_062.png b/clusterApp/Res/image/eco-720_062.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_062.png
rename to clusterApp/Res/image/eco-720_062.png
diff --git a/insDavi2.0/Res/image/eco-720_063.png b/clusterApp/Res/image/eco-720_063.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_063.png
rename to clusterApp/Res/image/eco-720_063.png
diff --git a/insDavi2.0/Res/image/eco-720_064.png b/clusterApp/Res/image/eco-720_064.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_064.png
rename to clusterApp/Res/image/eco-720_064.png
diff --git a/insDavi2.0/Res/image/eco-720_065.png b/clusterApp/Res/image/eco-720_065.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_065.png
rename to clusterApp/Res/image/eco-720_065.png
diff --git a/insDavi2.0/Res/image/eco-720_066.png b/clusterApp/Res/image/eco-720_066.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_066.png
rename to clusterApp/Res/image/eco-720_066.png
diff --git a/insDavi2.0/Res/image/eco-720_067.png b/clusterApp/Res/image/eco-720_067.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_067.png
rename to clusterApp/Res/image/eco-720_067.png
diff --git a/insDavi2.0/Res/image/eco-720_068.png b/clusterApp/Res/image/eco-720_068.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_068.png
rename to clusterApp/Res/image/eco-720_068.png
diff --git a/insDavi2.0/Res/image/eco-720_069.png b/clusterApp/Res/image/eco-720_069.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_069.png
rename to clusterApp/Res/image/eco-720_069.png
diff --git a/insDavi2.0/Res/image/eco-720_070.png b/clusterApp/Res/image/eco-720_070.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_070.png
rename to clusterApp/Res/image/eco-720_070.png
diff --git a/insDavi2.0/Res/image/eco-720_071.png b/clusterApp/Res/image/eco-720_071.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_071.png
rename to clusterApp/Res/image/eco-720_071.png
diff --git a/insDavi2.0/Res/image/eco-720_072.png b/clusterApp/Res/image/eco-720_072.png
similarity index 100%
rename from insDavi2.0/Res/image/eco-720_072.png
rename to clusterApp/Res/image/eco-720_072.png
diff --git a/insDavi2.0/Res/image/eco_001.png b/clusterApp/Res/image/eco_001.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_001.png
rename to clusterApp/Res/image/eco_001.png
diff --git a/insDavi2.0/Res/image/eco_002.png b/clusterApp/Res/image/eco_002.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_002.png
rename to clusterApp/Res/image/eco_002.png
diff --git a/insDavi2.0/Res/image/eco_003.png b/clusterApp/Res/image/eco_003.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_003.png
rename to clusterApp/Res/image/eco_003.png
diff --git a/insDavi2.0/Res/image/eco_004.png b/clusterApp/Res/image/eco_004.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_004.png
rename to clusterApp/Res/image/eco_004.png
diff --git a/insDavi2.0/Res/image/eco_005.png b/clusterApp/Res/image/eco_005.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_005.png
rename to clusterApp/Res/image/eco_005.png
diff --git a/insDavi2.0/Res/image/eco_006.png b/clusterApp/Res/image/eco_006.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_006.png
rename to clusterApp/Res/image/eco_006.png
diff --git a/insDavi2.0/Res/image/eco_007.png b/clusterApp/Res/image/eco_007.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_007.png
rename to clusterApp/Res/image/eco_007.png
diff --git a/insDavi2.0/Res/image/eco_008.png b/clusterApp/Res/image/eco_008.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_008.png
rename to clusterApp/Res/image/eco_008.png
diff --git a/insDavi2.0/Res/image/eco_009.png b/clusterApp/Res/image/eco_009.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_009.png
rename to clusterApp/Res/image/eco_009.png
diff --git a/insDavi2.0/Res/image/eco_010.png b/clusterApp/Res/image/eco_010.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_010.png
rename to clusterApp/Res/image/eco_010.png
diff --git a/insDavi2.0/Res/image/eco_011.png b/clusterApp/Res/image/eco_011.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_011.png
rename to clusterApp/Res/image/eco_011.png
diff --git a/insDavi2.0/Res/image/eco_012.png b/clusterApp/Res/image/eco_012.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_012.png
rename to clusterApp/Res/image/eco_012.png
diff --git a/insDavi2.0/Res/image/eco_013.png b/clusterApp/Res/image/eco_013.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_013.png
rename to clusterApp/Res/image/eco_013.png
diff --git a/insDavi2.0/Res/image/eco_014.png b/clusterApp/Res/image/eco_014.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_014.png
rename to clusterApp/Res/image/eco_014.png
diff --git a/insDavi2.0/Res/image/eco_015.png b/clusterApp/Res/image/eco_015.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_015.png
rename to clusterApp/Res/image/eco_015.png
diff --git a/insDavi2.0/Res/image/eco_016.png b/clusterApp/Res/image/eco_016.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_016.png
rename to clusterApp/Res/image/eco_016.png
diff --git a/insDavi2.0/Res/image/eco_017.png b/clusterApp/Res/image/eco_017.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_017.png
rename to clusterApp/Res/image/eco_017.png
diff --git a/insDavi2.0/Res/image/eco_018.png b/clusterApp/Res/image/eco_018.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_018.png
rename to clusterApp/Res/image/eco_018.png
diff --git a/insDavi2.0/Res/image/eco_019.png b/clusterApp/Res/image/eco_019.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_019.png
rename to clusterApp/Res/image/eco_019.png
diff --git a/insDavi2.0/Res/image/eco_020.png b/clusterApp/Res/image/eco_020.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_020.png
rename to clusterApp/Res/image/eco_020.png
diff --git a/insDavi2.0/Res/image/eco_021.png b/clusterApp/Res/image/eco_021.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_021.png
rename to clusterApp/Res/image/eco_021.png
diff --git a/insDavi2.0/Res/image/eco_022.png b/clusterApp/Res/image/eco_022.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_022.png
rename to clusterApp/Res/image/eco_022.png
diff --git a/insDavi2.0/Res/image/eco_023.png b/clusterApp/Res/image/eco_023.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_023.png
rename to clusterApp/Res/image/eco_023.png
diff --git a/insDavi2.0/Res/image/eco_024.png b/clusterApp/Res/image/eco_024.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_024.png
rename to clusterApp/Res/image/eco_024.png
diff --git a/insDavi2.0/Res/image/eco_025.png b/clusterApp/Res/image/eco_025.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_025.png
rename to clusterApp/Res/image/eco_025.png
diff --git a/insDavi2.0/Res/image/eco_026.png b/clusterApp/Res/image/eco_026.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_026.png
rename to clusterApp/Res/image/eco_026.png
diff --git a/insDavi2.0/Res/image/eco_027.png b/clusterApp/Res/image/eco_027.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_027.png
rename to clusterApp/Res/image/eco_027.png
diff --git a/insDavi2.0/Res/image/eco_028.png b/clusterApp/Res/image/eco_028.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_028.png
rename to clusterApp/Res/image/eco_028.png
diff --git a/insDavi2.0/Res/image/eco_029.png b/clusterApp/Res/image/eco_029.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_029.png
rename to clusterApp/Res/image/eco_029.png
diff --git a/insDavi2.0/Res/image/eco_030.png b/clusterApp/Res/image/eco_030.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_030.png
rename to clusterApp/Res/image/eco_030.png
diff --git a/insDavi2.0/Res/image/eco_031.png b/clusterApp/Res/image/eco_031.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_031.png
rename to clusterApp/Res/image/eco_031.png
diff --git a/insDavi2.0/Res/image/eco_032.png b/clusterApp/Res/image/eco_032.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_032.png
rename to clusterApp/Res/image/eco_032.png
diff --git a/insDavi2.0/Res/image/eco_033.png b/clusterApp/Res/image/eco_033.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_033.png
rename to clusterApp/Res/image/eco_033.png
diff --git a/insDavi2.0/Res/image/eco_034.png b/clusterApp/Res/image/eco_034.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_034.png
rename to clusterApp/Res/image/eco_034.png
diff --git a/insDavi2.0/Res/image/eco_035.png b/clusterApp/Res/image/eco_035.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_035.png
rename to clusterApp/Res/image/eco_035.png
diff --git a/insDavi2.0/Res/image/eco_036.png b/clusterApp/Res/image/eco_036.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_036.png
rename to clusterApp/Res/image/eco_036.png
diff --git a/insDavi2.0/Res/image/eco_037.png b/clusterApp/Res/image/eco_037.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_037.png
rename to clusterApp/Res/image/eco_037.png
diff --git a/insDavi2.0/Res/image/eco_038.png b/clusterApp/Res/image/eco_038.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_038.png
rename to clusterApp/Res/image/eco_038.png
diff --git a/insDavi2.0/Res/image/eco_039.png b/clusterApp/Res/image/eco_039.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_039.png
rename to clusterApp/Res/image/eco_039.png
diff --git a/insDavi2.0/Res/image/eco_040.png b/clusterApp/Res/image/eco_040.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_040.png
rename to clusterApp/Res/image/eco_040.png
diff --git a/insDavi2.0/Res/image/eco_041.png b/clusterApp/Res/image/eco_041.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_041.png
rename to clusterApp/Res/image/eco_041.png
diff --git a/insDavi2.0/Res/image/eco_042.png b/clusterApp/Res/image/eco_042.png
similarity index 100%
rename from insDavi2.0/Res/image/eco_042.png
rename to clusterApp/Res/image/eco_042.png
diff --git a/insDavi2.0/Res/image/gear_tip_d.tga b/clusterApp/Res/image/gear_tip_d.tga
similarity index 100%
rename from insDavi2.0/Res/image/gear_tip_d.tga
rename to clusterApp/Res/image/gear_tip_d.tga
diff --git a/insDavi2.0/Res/image/gear_tip_d_gray.tga b/clusterApp/Res/image/gear_tip_d_gray.tga
similarity index 100%
rename from insDavi2.0/Res/image/gear_tip_d_gray.tga
rename to clusterApp/Res/image/gear_tip_d_gray.tga
diff --git a/insDavi2.0/Res/image/gear_tip_n.tga b/clusterApp/Res/image/gear_tip_n.tga
similarity index 100%
rename from insDavi2.0/Res/image/gear_tip_n.tga
rename to clusterApp/Res/image/gear_tip_n.tga
diff --git a/insDavi2.0/Res/image/gear_tip_n_gray.tga b/clusterApp/Res/image/gear_tip_n_gray.tga
similarity index 100%
rename from insDavi2.0/Res/image/gear_tip_n_gray.tga
rename to clusterApp/Res/image/gear_tip_n_gray.tga
diff --git a/insDavi2.0/Res/image/gear_tip_p.tga b/clusterApp/Res/image/gear_tip_p.tga
similarity index 100%
rename from insDavi2.0/Res/image/gear_tip_p.tga
rename to clusterApp/Res/image/gear_tip_p.tga
diff --git a/insDavi2.0/Res/image/gear_tip_p_gray.tga b/clusterApp/Res/image/gear_tip_p_gray.tga
similarity index 100%
rename from insDavi2.0/Res/image/gear_tip_p_gray.tga
rename to clusterApp/Res/image/gear_tip_p_gray.tga
diff --git a/insDavi2.0/Res/image/gear_tip_r.tga b/clusterApp/Res/image/gear_tip_r.tga
similarity index 100%
rename from insDavi2.0/Res/image/gear_tip_r.tga
rename to clusterApp/Res/image/gear_tip_r.tga
diff --git a/insDavi2.0/Res/image/gear_tip_r_gray.tga b/clusterApp/Res/image/gear_tip_r_gray.tga
similarity index 100%
rename from insDavi2.0/Res/image/gear_tip_r_gray.tga
rename to clusterApp/Res/image/gear_tip_r_gray.tga
diff --git a/insDavi2.0/Res/image/gear_tip_r_gray_.tga b/clusterApp/Res/image/gear_tip_r_gray_.tga
similarity index 100%
rename from insDavi2.0/Res/image/gear_tip_r_gray_.tga
rename to clusterApp/Res/image/gear_tip_r_gray_.tga
diff --git a/insDavi2.0/Res/image/hint_background.tga b/clusterApp/Res/image/hint_background.tga
similarity index 100%
rename from insDavi2.0/Res/image/hint_background.tga
rename to clusterApp/Res/image/hint_background.tga
diff --git a/insDavi2.0/Res/image/hint_head_background.png b/clusterApp/Res/image/hint_head_background.png
similarity index 100%
rename from insDavi2.0/Res/image/hint_head_background.png
rename to clusterApp/Res/image/hint_head_background.png
diff --git a/insDavi2.0/Res/image/hint_head_big.png b/clusterApp/Res/image/hint_head_big.png
similarity index 100%
rename from insDavi2.0/Res/image/hint_head_big.png
rename to clusterApp/Res/image/hint_head_big.png
diff --git a/insDavi2.0/Res/image/hint_head_s.png b/clusterApp/Res/image/hint_head_s.png
similarity index 100%
rename from insDavi2.0/Res/image/hint_head_s.png
rename to clusterApp/Res/image/hint_head_s.png
diff --git a/insDavi2.0/Res/image/hint_icon_distraction.png b/clusterApp/Res/image/hint_icon_distraction.png
similarity index 100%
rename from insDavi2.0/Res/image/hint_icon_distraction.png
rename to clusterApp/Res/image/hint_icon_distraction.png
diff --git a/insDavi2.0/Res/image/hint_icon_distraction_lcc.png b/clusterApp/Res/image/hint_icon_distraction_lcc.png
similarity index 100%
rename from insDavi2.0/Res/image/hint_icon_distraction_lcc.png
rename to clusterApp/Res/image/hint_icon_distraction_lcc.png
diff --git a/insDavi2.0/Res/image/hint_icon_tired.png b/clusterApp/Res/image/hint_icon_tired.png
similarity index 100%
rename from insDavi2.0/Res/image/hint_icon_tired.png
rename to clusterApp/Res/image/hint_icon_tired.png
diff --git a/insDavi2.0/Res/image/hint_icon_tired_2.png b/clusterApp/Res/image/hint_icon_tired_2.png
similarity index 100%
rename from insDavi2.0/Res/image/hint_icon_tired_2.png
rename to clusterApp/Res/image/hint_icon_tired_2.png
diff --git a/insDavi2.0/Res/image/led_12v_bat.tga b/clusterApp/Res/image/led_12v_bat.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_12v_bat.tga
rename to clusterApp/Res/image/led_12v_bat.tga
diff --git a/insDavi2.0/Res/image/led_abs.tga b/clusterApp/Res/image/led_abs.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_abs.tga
rename to clusterApp/Res/image/led_abs.tga
diff --git a/insDavi2.0/Res/image/led_ac_overcost.tga b/clusterApp/Res/image/led_ac_overcost.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_ac_overcost.tga
rename to clusterApp/Res/image/led_ac_overcost.tga
diff --git a/insDavi2.0/Res/image/led_acc_blue.tga b/clusterApp/Res/image/led_acc_blue.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_acc_blue.tga
rename to clusterApp/Res/image/led_acc_blue.tga
diff --git a/insDavi2.0/Res/image/led_acc_blue_pointer.tga b/clusterApp/Res/image/led_acc_blue_pointer.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_acc_blue_pointer.tga
rename to clusterApp/Res/image/led_acc_blue_pointer.tga
diff --git a/insDavi2.0/Res/image/led_acc_failure.tga b/clusterApp/Res/image/led_acc_failure.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_acc_failure.tga
rename to clusterApp/Res/image/led_acc_failure.tga
diff --git a/insDavi2.0/Res/image/led_acc_hold.tga b/clusterApp/Res/image/led_acc_hold.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_acc_hold.tga
rename to clusterApp/Res/image/led_acc_hold.tga
diff --git a/insDavi2.0/Res/image/led_acc_normal.tga b/clusterApp/Res/image/led_acc_normal.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_acc_normal.tga
rename to clusterApp/Res/image/led_acc_normal.tga
diff --git a/insDavi2.0/Res/image/led_acc_white_arrow.tga b/clusterApp/Res/image/led_acc_white_arrow.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_acc_white_arrow.tga
rename to clusterApp/Res/image/led_acc_white_arrow.tga
diff --git a/insDavi2.0/Res/image/led_air_bag.tga b/clusterApp/Res/image/led_air_bag.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_air_bag.tga
rename to clusterApp/Res/image/led_air_bag.tga
diff --git a/insDavi2.0/Res/image/led_anti_theft.tga b/clusterApp/Res/image/led_anti_theft.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_anti_theft.tga
rename to clusterApp/Res/image/led_anti_theft.tga
diff --git a/insDavi2.0/Res/image/led_avh_green.tga b/clusterApp/Res/image/led_avh_green.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_avh_green.tga
rename to clusterApp/Res/image/led_avh_green.tga
diff --git a/insDavi2.0/Res/image/led_avh_yellow.tga b/clusterApp/Res/image/led_avh_yellow.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_avh_yellow.tga
rename to clusterApp/Res/image/led_avh_yellow.tga
diff --git a/insDavi2.0/Res/image/led_back_trunk_err.tga b/clusterApp/Res/image/led_back_trunk_err.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_back_trunk_err.tga
rename to clusterApp/Res/image/led_back_trunk_err.tga
diff --git a/insDavi2.0/Res/image/led_bat_lack.tga b/clusterApp/Res/image/led_bat_lack.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_bat_lack.tga
rename to clusterApp/Res/image/led_bat_lack.tga
diff --git a/insDavi2.0/Res/image/led_battery_cold.tga b/clusterApp/Res/image/led_battery_cold.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_battery_cold.tga
rename to clusterApp/Res/image/led_battery_cold.tga
diff --git a/insDavi2.0/Res/image/led_battery_err.tga b/clusterApp/Res/image/led_battery_err.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_battery_err.tga
rename to clusterApp/Res/image/led_battery_err.tga
diff --git a/insDavi2.0/Res/image/led_battery_lack.tga b/clusterApp/Res/image/led_battery_lack.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_battery_lack.tga
rename to clusterApp/Res/image/led_battery_lack.tga
diff --git a/insDavi2.0/Res/image/led_battery_off.tga b/clusterApp/Res/image/led_battery_off.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_battery_off.tga
rename to clusterApp/Res/image/led_battery_off.tga
diff --git a/insDavi2.0/Res/image/led_battery_overheat.tga b/clusterApp/Res/image/led_battery_overheat.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_battery_overheat.tga
rename to clusterApp/Res/image/led_battery_overheat.tga
diff --git a/insDavi2.0/Res/image/led_brake_err.tga b/clusterApp/Res/image/led_brake_err.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_brake_err.tga
rename to clusterApp/Res/image/led_brake_err.tga
diff --git a/insDavi2.0/Res/image/led_brake_syserr.tga b/clusterApp/Res/image/led_brake_syserr.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_brake_syserr.tga
rename to clusterApp/Res/image/led_brake_syserr.tga
diff --git a/insDavi2.0/Res/image/led_car_body.tga b/clusterApp/Res/image/led_car_body.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_car_body.tga
rename to clusterApp/Res/image/led_car_body.tga
diff --git a/insDavi2.0/Res/image/led_charge_conn.tga b/clusterApp/Res/image/led_charge_conn.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_charge_conn.tga
rename to clusterApp/Res/image/led_charge_conn.tga
diff --git a/insDavi2.0/Res/image/led_dead_zone.tga b/clusterApp/Res/image/led_dead_zone.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_dead_zone.tga
rename to clusterApp/Res/image/led_dead_zone.tga
diff --git a/insDavi2.0/Res/image/led_door_lb.tga b/clusterApp/Res/image/led_door_lb.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_door_lb.tga
rename to clusterApp/Res/image/led_door_lb.tga
diff --git a/insDavi2.0/Res/image/led_door_lf.tga b/clusterApp/Res/image/led_door_lf.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_door_lf.tga
rename to clusterApp/Res/image/led_door_lf.tga
diff --git a/insDavi2.0/Res/image/led_door_open.tga b/clusterApp/Res/image/led_door_open.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_door_open.tga
rename to clusterApp/Res/image/led_door_open.tga
diff --git a/insDavi2.0/Res/image/led_door_rb.tga b/clusterApp/Res/image/led_door_rb.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_door_rb.tga
rename to clusterApp/Res/image/led_door_rb.tga
diff --git a/insDavi2.0/Res/image/led_door_rf.tga b/clusterApp/Res/image/led_door_rf.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_door_rf.tga
rename to clusterApp/Res/image/led_door_rf.tga
diff --git a/insDavi2.0/Res/image/led_eco.tga b/clusterApp/Res/image/led_eco.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_eco.tga
rename to clusterApp/Res/image/led_eco.tga
diff --git a/insDavi2.0/Res/image/led_epb.tga b/clusterApp/Res/image/led_epb.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_epb.tga
rename to clusterApp/Res/image/led_epb.tga
diff --git a/insDavi2.0/Res/image/led_epb_err.tga b/clusterApp/Res/image/led_epb_err.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_epb_err.tga
rename to clusterApp/Res/image/led_epb_err.tga
diff --git a/insDavi2.0/Res/image/led_eps.tga b/clusterApp/Res/image/led_eps.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_eps.tga
rename to clusterApp/Res/image/led_eps.tga
diff --git a/insDavi2.0/Res/image/led_esp.tga b/clusterApp/Res/image/led_esp.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_esp.tga
rename to clusterApp/Res/image/led_esp.tga
diff --git a/insDavi2.0/Res/image/led_esp_off.tga b/clusterApp/Res/image/led_esp_off.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_esp_off.tga
rename to clusterApp/Res/image/led_esp_off.tga
diff --git a/insDavi2.0/Res/image/led_front_collision.tga b/clusterApp/Res/image/led_front_collision.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_front_collision.tga
rename to clusterApp/Res/image/led_front_collision.tga
diff --git a/insDavi2.0/Res/image/led_front_fog.tga b/clusterApp/Res/image/led_front_fog.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_front_fog.tga
rename to clusterApp/Res/image/led_front_fog.tga
diff --git a/insDavi2.0/Res/image/led_hdc_green.tga b/clusterApp/Res/image/led_hdc_green.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_hdc_green.tga
rename to clusterApp/Res/image/led_hdc_green.tga
diff --git a/insDavi2.0/Res/image/led_hdc_yellow.tga b/clusterApp/Res/image/led_hdc_yellow.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_hdc_yellow.tga
rename to clusterApp/Res/image/led_hdc_yellow.tga
diff --git a/insDavi2.0/Res/image/led_high_beam.tga b/clusterApp/Res/image/led_high_beam.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_high_beam.tga
rename to clusterApp/Res/image/led_high_beam.tga
diff --git a/insDavi2.0/Res/image/led_high_beam_A.tga b/clusterApp/Res/image/led_high_beam_A.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_high_beam_A.tga
rename to clusterApp/Res/image/led_high_beam_A.tga
diff --git a/insDavi2.0/Res/image/led_intelligent_sys_err.tga b/clusterApp/Res/image/led_intelligent_sys_err.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_intelligent_sys_err.tga
rename to clusterApp/Res/image/led_intelligent_sys_err.tga
diff --git a/insDavi2.0/Res/image/led_lane_offtrack.tga b/clusterApp/Res/image/led_lane_offtrack.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_lane_offtrack.tga
rename to clusterApp/Res/image/led_lane_offtrack.tga
diff --git a/insDavi2.0/Res/image/led_low_beam.tga b/clusterApp/Res/image/led_low_beam.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_low_beam.tga
rename to clusterApp/Res/image/led_low_beam.tga
diff --git a/insDavi2.0/Res/image/led_low_beam_A.tga b/clusterApp/Res/image/led_low_beam_A.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_low_beam_A.tga
rename to clusterApp/Res/image/led_low_beam_A.tga
diff --git a/insDavi2.0/Res/image/led_main_alert.tga b/clusterApp/Res/image/led_main_alert.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_main_alert.tga
rename to clusterApp/Res/image/led_main_alert.tga
diff --git a/insDavi2.0/Res/image/led_motor_err.tga b/clusterApp/Res/image/led_motor_err.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_motor_err.tga
rename to clusterApp/Res/image/led_motor_err.tga
diff --git a/insDavi2.0/Res/image/led_motor_overheat.tga b/clusterApp/Res/image/led_motor_overheat.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_motor_overheat.tga
rename to clusterApp/Res/image/led_motor_overheat.tga
diff --git a/insDavi2.0/Res/image/led_position_hint.tga b/clusterApp/Res/image/led_position_hint.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_position_hint.tga
rename to clusterApp/Res/image/led_position_hint.tga
diff --git a/insDavi2.0/Res/image/led_postiont_hint.tga b/clusterApp/Res/image/led_postiont_hint.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_postiont_hint.tga
rename to clusterApp/Res/image/led_postiont_hint.tga
diff --git a/insDavi2.0/Res/image/led_power_limit.tga b/clusterApp/Res/image/led_power_limit.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_power_limit.tga
rename to clusterApp/Res/image/led_power_limit.tga
diff --git a/insDavi2.0/Res/image/led_ready.tga b/clusterApp/Res/image/led_ready.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_ready.tga
rename to clusterApp/Res/image/led_ready.tga
diff --git a/insDavi2.0/Res/image/led_rear_fog.tga b/clusterApp/Res/image/led_rear_fog.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_rear_fog.tga
rename to clusterApp/Res/image/led_rear_fog.tga
diff --git a/insDavi2.0/Res/image/led_scrubbing_lack.tga b/clusterApp/Res/image/led_scrubbing_lack.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_scrubbing_lack.tga
rename to clusterApp/Res/image/led_scrubbing_lack.tga
diff --git a/insDavi2.0/Res/image/led_seat_belt_d.tga b/clusterApp/Res/image/led_seat_belt_d.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_seat_belt_d.tga
rename to clusterApp/Res/image/led_seat_belt_d.tga
diff --git a/insDavi2.0/Res/image/led_seat_belt_p.tga b/clusterApp/Res/image/led_seat_belt_p.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_seat_belt_p.tga
rename to clusterApp/Res/image/led_seat_belt_p.tga
diff --git a/insDavi2.0/Res/image/led_seatbelt_bl.tga b/clusterApp/Res/image/led_seatbelt_bl.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_seatbelt_bl.tga
rename to clusterApp/Res/image/led_seatbelt_bl.tga
diff --git a/insDavi2.0/Res/image/led_seatbelt_bl_gray.tga b/clusterApp/Res/image/led_seatbelt_bl_gray.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_seatbelt_bl_gray.tga
rename to clusterApp/Res/image/led_seatbelt_bl_gray.tga
diff --git a/insDavi2.0/Res/image/led_seatbelt_bm.tga b/clusterApp/Res/image/led_seatbelt_bm.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_seatbelt_bm.tga
rename to clusterApp/Res/image/led_seatbelt_bm.tga
diff --git a/insDavi2.0/Res/image/led_seatbelt_bm_gray.tga b/clusterApp/Res/image/led_seatbelt_bm_gray.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_seatbelt_bm_gray.tga
rename to clusterApp/Res/image/led_seatbelt_bm_gray.tga
diff --git a/insDavi2.0/Res/image/led_seatbelt_br.tga b/clusterApp/Res/image/led_seatbelt_br.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_seatbelt_br.tga
rename to clusterApp/Res/image/led_seatbelt_br.tga
diff --git a/insDavi2.0/Res/image/led_seatbelt_br_gray.tga b/clusterApp/Res/image/led_seatbelt_br_gray.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_seatbelt_br_gray.tga
rename to clusterApp/Res/image/led_seatbelt_br_gray.tga
diff --git a/insDavi2.0/Res/image/led_seatbelt_d.tga b/clusterApp/Res/image/led_seatbelt_d.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_seatbelt_d.tga
rename to clusterApp/Res/image/led_seatbelt_d.tga
diff --git a/insDavi2.0/Res/image/led_seatbelt_p.tga b/clusterApp/Res/image/led_seatbelt_p.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_seatbelt_p.tga
rename to clusterApp/Res/image/led_seatbelt_p.tga
diff --git a/insDavi2.0/Res/image/led_sound_off.tga b/clusterApp/Res/image/led_sound_off.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_sound_off.tga
rename to clusterApp/Res/image/led_sound_off.tga
diff --git a/insDavi2.0/Res/image/led_speed_limit_bg.tga b/clusterApp/Res/image/led_speed_limit_bg.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_speed_limit_bg.tga
rename to clusterApp/Res/image/led_speed_limit_bg.tga
diff --git a/insDavi2.0/Res/image/led_sport.tga b/clusterApp/Res/image/led_sport.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_sport.tga
rename to clusterApp/Res/image/led_sport.tga
diff --git a/insDavi2.0/Res/image/led_tpms.tga b/clusterApp/Res/image/led_tpms.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_tpms.tga
rename to clusterApp/Res/image/led_tpms.tga
diff --git a/insDavi2.0/Res/image/led_tpms_pressure.tga b/clusterApp/Res/image/led_tpms_pressure.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_tpms_pressure.tga
rename to clusterApp/Res/image/led_tpms_pressure.tga
diff --git a/insDavi2.0/Res/image/led_tpms_temperature.tga b/clusterApp/Res/image/led_tpms_temperature.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_tpms_temperature.tga
rename to clusterApp/Res/image/led_tpms_temperature.tga
diff --git a/insDavi2.0/Res/image/led_traffic_camera.tga b/clusterApp/Res/image/led_traffic_camera.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_traffic_camera.tga
rename to clusterApp/Res/image/led_traffic_camera.tga
diff --git a/insDavi2.0/Res/image/led_turn_left.tga b/clusterApp/Res/image/led_turn_left.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_turn_left.tga
rename to clusterApp/Res/image/led_turn_left.tga
diff --git a/insDavi2.0/Res/image/led_turn_right.tga b/clusterApp/Res/image/led_turn_right.tga
similarity index 100%
rename from insDavi2.0/Res/image/led_turn_right.tga
rename to clusterApp/Res/image/led_turn_right.tga
diff --git a/insDavi2.0/Res/image/logo.png b/clusterApp/Res/image/logo.png
similarity index 100%
rename from insDavi2.0/Res/image/logo.png
rename to clusterApp/Res/image/logo.png
diff --git a/insDavi2.0/Res/image/menu_2nd_bg.png b/clusterApp/Res/image/menu_2nd_bg.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_2nd_bg.png
rename to clusterApp/Res/image/menu_2nd_bg.png
diff --git a/insDavi2.0/Res/image/menu_2nd_bg.tga b/clusterApp/Res/image/menu_2nd_bg.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_2nd_bg.tga
rename to clusterApp/Res/image/menu_2nd_bg.tga
diff --git a/insDavi2.0/Res/image/menu_2nd_icon_brightness.png b/clusterApp/Res/image/menu_2nd_icon_brightness.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_2nd_icon_brightness.png
rename to clusterApp/Res/image/menu_2nd_icon_brightness.png
diff --git a/insDavi2.0/Res/image/menu_2nd_icon_brightness.tga b/clusterApp/Res/image/menu_2nd_icon_brightness.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_2nd_icon_brightness.tga
rename to clusterApp/Res/image/menu_2nd_icon_brightness.tga
diff --git a/insDavi2.0/Res/image/menu_2nd_icon_fan.png b/clusterApp/Res/image/menu_2nd_icon_fan.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_2nd_icon_fan.png
rename to clusterApp/Res/image/menu_2nd_icon_fan.png
diff --git a/insDavi2.0/Res/image/menu_2nd_icon_fan.tga b/clusterApp/Res/image/menu_2nd_icon_fan.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_2nd_icon_fan.tga
rename to clusterApp/Res/image/menu_2nd_icon_fan.tga
diff --git a/insDavi2.0/Res/image/menu_2nd_icon_music_blt.tga b/clusterApp/Res/image/menu_2nd_icon_music_blt.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_2nd_icon_music_blt.tga
rename to clusterApp/Res/image/menu_2nd_icon_music_blt.tga
diff --git a/insDavi2.0/Res/image/menu_2nd_icon_music_local.tga b/clusterApp/Res/image/menu_2nd_icon_music_local.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_2nd_icon_music_local.tga
rename to clusterApp/Res/image/menu_2nd_icon_music_local.tga
diff --git a/insDavi2.0/Res/image/menu_2nd_icon_radio_local.tga b/clusterApp/Res/image/menu_2nd_icon_radio_local.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_2nd_icon_radio_local.tga
rename to clusterApp/Res/image/menu_2nd_icon_radio_local.tga
diff --git a/insDavi2.0/Res/image/menu_2nd_icon_radio_tbook.tga b/clusterApp/Res/image/menu_2nd_icon_radio_tbook.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_2nd_icon_radio_tbook.tga
rename to clusterApp/Res/image/menu_2nd_icon_radio_tbook.tga
diff --git a/insDavi2.0/Res/image/menu_2nd_icon_temp_bg.png b/clusterApp/Res/image/menu_2nd_icon_temp_bg.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_2nd_icon_temp_bg.png
rename to clusterApp/Res/image/menu_2nd_icon_temp_bg.png
diff --git a/insDavi2.0/Res/image/menu_2nd_icon_temp_bg.tga b/clusterApp/Res/image/menu_2nd_icon_temp_bg.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_2nd_icon_temp_bg.tga
rename to clusterApp/Res/image/menu_2nd_icon_temp_bg.tga
diff --git a/insDavi2.0/Res/image/menu_2nd_icon_temp_progress.png b/clusterApp/Res/image/menu_2nd_icon_temp_progress.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_2nd_icon_temp_progress.png
rename to clusterApp/Res/image/menu_2nd_icon_temp_progress.png
diff --git a/insDavi2.0/Res/image/menu_2nd_icon_temp_progress.tga b/clusterApp/Res/image/menu_2nd_icon_temp_progress.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_2nd_icon_temp_progress.tga
rename to clusterApp/Res/image/menu_2nd_icon_temp_progress.tga
diff --git a/insDavi2.0/Res/image/menu_2nd_icon_windymode_down.png b/clusterApp/Res/image/menu_2nd_icon_windymode_down.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_2nd_icon_windymode_down.png
rename to clusterApp/Res/image/menu_2nd_icon_windymode_down.png
diff --git a/insDavi2.0/Res/image/menu_2nd_icon_windymode_down.tga b/clusterApp/Res/image/menu_2nd_icon_windymode_down.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_2nd_icon_windymode_down.tga
rename to clusterApp/Res/image/menu_2nd_icon_windymode_down.tga
diff --git a/insDavi2.0/Res/image/menu_2nd_icon_windymode_side.tga b/clusterApp/Res/image/menu_2nd_icon_windymode_side.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_2nd_icon_windymode_side.tga
rename to clusterApp/Res/image/menu_2nd_icon_windymode_side.tga
diff --git a/insDavi2.0/Res/image/menu_2nd_icon_windymode_up.png b/clusterApp/Res/image/menu_2nd_icon_windymode_up.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_2nd_icon_windymode_up.png
rename to clusterApp/Res/image/menu_2nd_icon_windymode_up.png
diff --git a/insDavi2.0/Res/image/menu_2nd_icon_windymode_up.tga b/clusterApp/Res/image/menu_2nd_icon_windymode_up.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_2nd_icon_windymode_up.tga
rename to clusterApp/Res/image/menu_2nd_icon_windymode_up.tga
diff --git a/insDavi2.0/Res/image/menu_2nd_value_set_cursor.png b/clusterApp/Res/image/menu_2nd_value_set_cursor.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_2nd_value_set_cursor.png
rename to clusterApp/Res/image/menu_2nd_value_set_cursor.png
diff --git a/insDavi2.0/Res/image/menu_2nd_value_set_cursor.tga b/clusterApp/Res/image/menu_2nd_value_set_cursor.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_2nd_value_set_cursor.tga
rename to clusterApp/Res/image/menu_2nd_value_set_cursor.tga
diff --git a/insDavi2.0/Res/image/menu_2nd_value_set_progress.png b/clusterApp/Res/image/menu_2nd_value_set_progress.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_2nd_value_set_progress.png
rename to clusterApp/Res/image/menu_2nd_value_set_progress.png
diff --git a/insDavi2.0/Res/image/menu_2nd_value_set_progress.tga b/clusterApp/Res/image/menu_2nd_value_set_progress.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_2nd_value_set_progress.tga
rename to clusterApp/Res/image/menu_2nd_value_set_progress.tga
diff --git a/insDavi2.0/Res/image/menu_2nd_value_set_progress_bg.png b/clusterApp/Res/image/menu_2nd_value_set_progress_bg.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_2nd_value_set_progress_bg.png
rename to clusterApp/Res/image/menu_2nd_value_set_progress_bg.png
diff --git a/insDavi2.0/Res/image/menu_2nd_value_set_progress_bg.tga b/clusterApp/Res/image/menu_2nd_value_set_progress_bg.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_2nd_value_set_progress_bg.tga
rename to clusterApp/Res/image/menu_2nd_value_set_progress_bg.tga
diff --git a/insDavi2.0/Res/image/menu_icon_brightness.png b/clusterApp/Res/image/menu_icon_brightness.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_icon_brightness.png
rename to clusterApp/Res/image/menu_icon_brightness.png
diff --git a/insDavi2.0/Res/image/menu_icon_brightness.tga b/clusterApp/Res/image/menu_icon_brightness.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_icon_brightness.tga
rename to clusterApp/Res/image/menu_icon_brightness.tga
diff --git a/insDavi2.0/Res/image/menu_icon_camera.png b/clusterApp/Res/image/menu_icon_camera.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_icon_camera.png
rename to clusterApp/Res/image/menu_icon_camera.png
diff --git a/insDavi2.0/Res/image/menu_icon_camera.tga b/clusterApp/Res/image/menu_icon_camera.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_icon_camera.tga
rename to clusterApp/Res/image/menu_icon_camera.tga
diff --git a/insDavi2.0/Res/image/menu_icon_fan.png b/clusterApp/Res/image/menu_icon_fan.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_icon_fan.png
rename to clusterApp/Res/image/menu_icon_fan.png
diff --git a/insDavi2.0/Res/image/menu_icon_fan.tga b/clusterApp/Res/image/menu_icon_fan.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_icon_fan.tga
rename to clusterApp/Res/image/menu_icon_fan.tga
diff --git a/insDavi2.0/Res/image/menu_icon_media.png b/clusterApp/Res/image/menu_icon_media.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_icon_media.png
rename to clusterApp/Res/image/menu_icon_media.png
diff --git a/insDavi2.0/Res/image/menu_icon_media.tga b/clusterApp/Res/image/menu_icon_media.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_icon_media.tga
rename to clusterApp/Res/image/menu_icon_media.tga
diff --git a/insDavi2.0/Res/image/menu_icon_thermometer.png b/clusterApp/Res/image/menu_icon_thermometer.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_icon_thermometer.png
rename to clusterApp/Res/image/menu_icon_thermometer.png
diff --git a/insDavi2.0/Res/image/menu_icon_thermometer.tga b/clusterApp/Res/image/menu_icon_thermometer.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_icon_thermometer.tga
rename to clusterApp/Res/image/menu_icon_thermometer.tga
diff --git a/insDavi2.0/Res/image/menu_icon_version.png b/clusterApp/Res/image/menu_icon_version.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_icon_version.png
rename to clusterApp/Res/image/menu_icon_version.png
diff --git a/insDavi2.0/Res/image/menu_icon_version.tga b/clusterApp/Res/image/menu_icon_version.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_icon_version.tga
rename to clusterApp/Res/image/menu_icon_version.tga
diff --git a/insDavi2.0/Res/image/menu_icon_windymode.png b/clusterApp/Res/image/menu_icon_windymode.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_icon_windymode.png
rename to clusterApp/Res/image/menu_icon_windymode.png
diff --git a/insDavi2.0/Res/image/menu_icon_windymode.tga b/clusterApp/Res/image/menu_icon_windymode.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_icon_windymode.tga
rename to clusterApp/Res/image/menu_icon_windymode.tga
diff --git a/insDavi2.0/Res/image/menu_left_acc_1.tga b/clusterApp/Res/image/menu_left_acc_1.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_left_acc_1.tga
rename to clusterApp/Res/image/menu_left_acc_1.tga
diff --git a/insDavi2.0/Res/image/menu_left_acc_2.tga b/clusterApp/Res/image/menu_left_acc_2.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_left_acc_2.tga
rename to clusterApp/Res/image/menu_left_acc_2.tga
diff --git a/insDavi2.0/Res/image/menu_left_acc_3.tga b/clusterApp/Res/image/menu_left_acc_3.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_left_acc_3.tga
rename to clusterApp/Res/image/menu_left_acc_3.tga
diff --git a/insDavi2.0/Res/image/menu_left_acc_4.tga b/clusterApp/Res/image/menu_left_acc_4.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_left_acc_4.tga
rename to clusterApp/Res/image/menu_left_acc_4.tga
diff --git a/insDavi2.0/Res/image/menu_left_acc_5.tga b/clusterApp/Res/image/menu_left_acc_5.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_left_acc_5.tga
rename to clusterApp/Res/image/menu_left_acc_5.tga
diff --git a/insDavi2.0/Res/image/menu_left_bg.tga b/clusterApp/Res/image/menu_left_bg.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_left_bg.tga
rename to clusterApp/Res/image/menu_left_bg.tga
diff --git a/insDavi2.0/Res/image/menu_left_icon_voice.tga b/clusterApp/Res/image/menu_left_icon_voice.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_left_icon_voice.tga
rename to clusterApp/Res/image/menu_left_icon_voice.tga
diff --git a/insDavi2.0/Res/image/menu_left_progress_bar.tga b/clusterApp/Res/image/menu_left_progress_bar.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_left_progress_bar.tga
rename to clusterApp/Res/image/menu_left_progress_bar.tga
diff --git a/insDavi2.0/Res/image/menu_left_progress_cursor.tga b/clusterApp/Res/image/menu_left_progress_cursor.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_left_progress_cursor.tga
rename to clusterApp/Res/image/menu_left_progress_cursor.tga
diff --git a/insDavi2.0/Res/image/menu_left_shadow.tga b/clusterApp/Res/image/menu_left_shadow.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_left_shadow.tga
rename to clusterApp/Res/image/menu_left_shadow.tga
diff --git a/insDavi2.0/Res/image/menu_left_txt_acc.tga b/clusterApp/Res/image/menu_left_txt_acc.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_left_txt_acc.tga
rename to clusterApp/Res/image/menu_left_txt_acc.tga
diff --git a/insDavi2.0/Res/image/menu_left_txt_voice_ai.tga b/clusterApp/Res/image/menu_left_txt_voice_ai.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_left_txt_voice_ai.tga
rename to clusterApp/Res/image/menu_left_txt_voice_ai.tga
diff --git a/insDavi2.0/Res/image/menu_left_txt_voice_media.tga b/clusterApp/Res/image/menu_left_txt_voice_media.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_left_txt_voice_media.tga
rename to clusterApp/Res/image/menu_left_txt_voice_media.tga
diff --git a/insDavi2.0/Res/image/menu_left_txt_voice_phone.tga b/clusterApp/Res/image/menu_left_txt_voice_phone.tga
similarity index 100%
rename from insDavi2.0/Res/image/menu_left_txt_voice_phone.tga
rename to clusterApp/Res/image/menu_left_txt_voice_phone.tga
diff --git a/insDavi2.0/Res/image/menu_right_icon_mediasrc.png b/clusterApp/Res/image/menu_right_icon_mediasrc.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_right_icon_mediasrc.png
rename to clusterApp/Res/image/menu_right_icon_mediasrc.png
diff --git a/insDavi2.0/Res/image/menu_right_icon_mediasrc_gray.png b/clusterApp/Res/image/menu_right_icon_mediasrc_gray.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_right_icon_mediasrc_gray.png
rename to clusterApp/Res/image/menu_right_icon_mediasrc_gray.png
diff --git a/insDavi2.0/Res/image/menu_right_icon_setsun.png b/clusterApp/Res/image/menu_right_icon_setsun.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_right_icon_setsun.png
rename to clusterApp/Res/image/menu_right_icon_setsun.png
diff --git a/insDavi2.0/Res/image/menu_right_icon_settemp.png b/clusterApp/Res/image/menu_right_icon_settemp.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_right_icon_settemp.png
rename to clusterApp/Res/image/menu_right_icon_settemp.png
diff --git a/insDavi2.0/Res/image/menu_right_icon_setwindpwr.png b/clusterApp/Res/image/menu_right_icon_setwindpwr.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_right_icon_setwindpwr.png
rename to clusterApp/Res/image/menu_right_icon_setwindpwr.png
diff --git a/insDavi2.0/Res/image/menu_right_icon_sun.png b/clusterApp/Res/image/menu_right_icon_sun.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_right_icon_sun.png
rename to clusterApp/Res/image/menu_right_icon_sun.png
diff --git a/insDavi2.0/Res/image/menu_right_icon_sun_gray.png b/clusterApp/Res/image/menu_right_icon_sun_gray.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_right_icon_sun_gray.png
rename to clusterApp/Res/image/menu_right_icon_sun_gray.png
diff --git a/insDavi2.0/Res/image/menu_right_icon_temp.png b/clusterApp/Res/image/menu_right_icon_temp.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_right_icon_temp.png
rename to clusterApp/Res/image/menu_right_icon_temp.png
diff --git a/insDavi2.0/Res/image/menu_right_icon_temp_gray.png b/clusterApp/Res/image/menu_right_icon_temp_gray.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_right_icon_temp_gray.png
rename to clusterApp/Res/image/menu_right_icon_temp_gray.png
diff --git a/insDavi2.0/Res/image/menu_right_icon_windmd.png b/clusterApp/Res/image/menu_right_icon_windmd.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_right_icon_windmd.png
rename to clusterApp/Res/image/menu_right_icon_windmd.png
diff --git a/insDavi2.0/Res/image/menu_right_icon_windmd_gray.png b/clusterApp/Res/image/menu_right_icon_windmd_gray.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_right_icon_windmd_gray.png
rename to clusterApp/Res/image/menu_right_icon_windmd_gray.png
diff --git a/insDavi2.0/Res/image/menu_right_icon_windpwr.png b/clusterApp/Res/image/menu_right_icon_windpwr.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_right_icon_windpwr.png
rename to clusterApp/Res/image/menu_right_icon_windpwr.png
diff --git a/insDavi2.0/Res/image/menu_right_icon_windpwr_gray.png b/clusterApp/Res/image/menu_right_icon_windpwr_gray.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_right_icon_windpwr_gray.png
rename to clusterApp/Res/image/menu_right_icon_windpwr_gray.png
diff --git a/insDavi2.0/Res/image/menu_right_lastused_brightness.png b/clusterApp/Res/image/menu_right_lastused_brightness.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_right_lastused_brightness.png
rename to clusterApp/Res/image/menu_right_lastused_brightness.png
diff --git a/insDavi2.0/Res/image/menu_right_lastused_media.png b/clusterApp/Res/image/menu_right_lastused_media.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_right_lastused_media.png
rename to clusterApp/Res/image/menu_right_lastused_media.png
diff --git a/insDavi2.0/Res/image/menu_right_lastused_temp.png b/clusterApp/Res/image/menu_right_lastused_temp.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_right_lastused_temp.png
rename to clusterApp/Res/image/menu_right_lastused_temp.png
diff --git a/insDavi2.0/Res/image/menu_right_lastused_windmd.png b/clusterApp/Res/image/menu_right_lastused_windmd.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_right_lastused_windmd.png
rename to clusterApp/Res/image/menu_right_lastused_windmd.png
diff --git a/insDavi2.0/Res/image/menu_right_lastused_windpwr.png b/clusterApp/Res/image/menu_right_lastused_windpwr.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_right_lastused_windpwr.png
rename to clusterApp/Res/image/menu_right_lastused_windpwr.png
diff --git a/insDavi2.0/Res/image/menu_right_shadow.png b/clusterApp/Res/image/menu_right_shadow.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_right_shadow.png
rename to clusterApp/Res/image/menu_right_shadow.png
diff --git a/insDavi2.0/Res/image/menu_right_value_set_bg.png b/clusterApp/Res/image/menu_right_value_set_bg.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_right_value_set_bg.png
rename to clusterApp/Res/image/menu_right_value_set_bg.png
diff --git a/insDavi2.0/Res/image/menu_right_value_set_icon_sun.png b/clusterApp/Res/image/menu_right_value_set_icon_sun.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_right_value_set_icon_sun.png
rename to clusterApp/Res/image/menu_right_value_set_icon_sun.png
diff --git a/insDavi2.0/Res/image/menu_right_value_set_icon_temp.png b/clusterApp/Res/image/menu_right_value_set_icon_temp.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_right_value_set_icon_temp.png
rename to clusterApp/Res/image/menu_right_value_set_icon_temp.png
diff --git a/insDavi2.0/Res/image/menu_right_value_set_icon_windpwr.png b/clusterApp/Res/image/menu_right_value_set_icon_windpwr.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_right_value_set_icon_windpwr.png
rename to clusterApp/Res/image/menu_right_value_set_icon_windpwr.png
diff --git a/insDavi2.0/Res/image/menu_right_value_set_pcursor.png b/clusterApp/Res/image/menu_right_value_set_pcursor.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_right_value_set_pcursor.png
rename to clusterApp/Res/image/menu_right_value_set_pcursor.png
diff --git a/insDavi2.0/Res/image/menu_right_value_set_progress.png b/clusterApp/Res/image/menu_right_value_set_progress.png
similarity index 100%
rename from insDavi2.0/Res/image/menu_right_value_set_progress.png
rename to clusterApp/Res/image/menu_right_value_set_progress.png
diff --git a/insDavi2.0/Res/image/module_L0_decoration.png b/clusterApp/Res/image/module_L0_decoration.png
similarity index 100%
rename from insDavi2.0/Res/image/module_L0_decoration.png
rename to clusterApp/Res/image/module_L0_decoration.png
diff --git a/insDavi2.0/Res/image/module_L0_icon__trip.png b/clusterApp/Res/image/module_L0_icon__trip.png
similarity index 100%
rename from insDavi2.0/Res/image/module_L0_icon__trip.png
rename to clusterApp/Res/image/module_L0_icon__trip.png
diff --git a/insDavi2.0/Res/image/module_L0_icon_clock.png b/clusterApp/Res/image/module_L0_icon_clock.png
similarity index 100%
rename from insDavi2.0/Res/image/module_L0_icon_clock.png
rename to clusterApp/Res/image/module_L0_icon_clock.png
diff --git a/insDavi2.0/Res/image/module_L0_icon_energy_cost.png b/clusterApp/Res/image/module_L0_icon_energy_cost.png
similarity index 100%
rename from insDavi2.0/Res/image/module_L0_icon_energy_cost.png
rename to clusterApp/Res/image/module_L0_icon_energy_cost.png
diff --git a/insDavi2.0/Res/image/module_L0_icon_media.png b/clusterApp/Res/image/module_L0_icon_media.png
similarity index 100%
rename from insDavi2.0/Res/image/module_L0_icon_media.png
rename to clusterApp/Res/image/module_L0_icon_media.png
diff --git a/insDavi2.0/Res/image/module_L0_icon_navigation.png b/clusterApp/Res/image/module_L0_icon_navigation.png
similarity index 100%
rename from insDavi2.0/Res/image/module_L0_icon_navigation.png
rename to clusterApp/Res/image/module_L0_icon_navigation.png
diff --git a/insDavi2.0/Res/image/module_L0_icon_null.png b/clusterApp/Res/image/module_L0_icon_null.png
similarity index 100%
rename from insDavi2.0/Res/image/module_L0_icon_null.png
rename to clusterApp/Res/image/module_L0_icon_null.png
diff --git a/insDavi2.0/Res/image/module_L0_icon_phone.png b/clusterApp/Res/image/module_L0_icon_phone.png
similarity index 100%
rename from insDavi2.0/Res/image/module_L0_icon_phone.png
rename to clusterApp/Res/image/module_L0_icon_phone.png
diff --git a/insDavi2.0/Res/image/module_L0_icon_vehicle_status.png b/clusterApp/Res/image/module_L0_icon_vehicle_status.png
similarity index 100%
rename from insDavi2.0/Res/image/module_L0_icon_vehicle_status.png
rename to clusterApp/Res/image/module_L0_icon_vehicle_status.png
diff --git a/insDavi2.0/Res/image/module_L0_icon_weather.png b/clusterApp/Res/image/module_L0_icon_weather.png
similarity index 100%
rename from insDavi2.0/Res/image/module_L0_icon_weather.png
rename to clusterApp/Res/image/module_L0_icon_weather.png
diff --git a/insDavi2.0/Res/image/module_L0_text_clock.tga b/clusterApp/Res/image/module_L0_text_clock.tga
similarity index 100%
rename from insDavi2.0/Res/image/module_L0_text_clock.tga
rename to clusterApp/Res/image/module_L0_text_clock.tga
diff --git a/insDavi2.0/Res/image/module_L0_text_energy.tga b/clusterApp/Res/image/module_L0_text_energy.tga
similarity index 100%
rename from insDavi2.0/Res/image/module_L0_text_energy.tga
rename to clusterApp/Res/image/module_L0_text_energy.tga
diff --git a/insDavi2.0/Res/image/module_L0_text_media.tga b/clusterApp/Res/image/module_L0_text_media.tga
similarity index 100%
rename from insDavi2.0/Res/image/module_L0_text_media.tga
rename to clusterApp/Res/image/module_L0_text_media.tga
diff --git a/insDavi2.0/Res/image/module_L0_text_navigation.tga b/clusterApp/Res/image/module_L0_text_navigation.tga
similarity index 100%
rename from insDavi2.0/Res/image/module_L0_text_navigation.tga
rename to clusterApp/Res/image/module_L0_text_navigation.tga
diff --git a/insDavi2.0/Res/image/module_L0_text_null.tga b/clusterApp/Res/image/module_L0_text_null.tga
similarity index 100%
rename from insDavi2.0/Res/image/module_L0_text_null.tga
rename to clusterApp/Res/image/module_L0_text_null.tga
diff --git a/insDavi2.0/Res/image/module_L0_text_status.tga b/clusterApp/Res/image/module_L0_text_status.tga
similarity index 100%
rename from insDavi2.0/Res/image/module_L0_text_status.tga
rename to clusterApp/Res/image/module_L0_text_status.tga
diff --git a/insDavi2.0/Res/image/module_L0_text_telephone.tga b/clusterApp/Res/image/module_L0_text_telephone.tga
similarity index 100%
rename from insDavi2.0/Res/image/module_L0_text_telephone.tga
rename to clusterApp/Res/image/module_L0_text_telephone.tga
diff --git a/insDavi2.0/Res/image/module_L0_text_trip.tga b/clusterApp/Res/image/module_L0_text_trip.tga
similarity index 100%
rename from insDavi2.0/Res/image/module_L0_text_trip.tga
rename to clusterApp/Res/image/module_L0_text_trip.tga
diff --git a/insDavi2.0/Res/image/module_L0_text_weather.tga b/clusterApp/Res/image/module_L0_text_weather.tga
similarity index 100%
rename from insDavi2.0/Res/image/module_L0_text_weather.tga
rename to clusterApp/Res/image/module_L0_text_weather.tga
diff --git a/insDavi2.0/Res/image/module_clock_bg.png b/clusterApp/Res/image/module_clock_bg.png
similarity index 100%
rename from insDavi2.0/Res/image/module_clock_bg.png
rename to clusterApp/Res/image/module_clock_bg.png
diff --git a/insDavi2.0/Res/image/module_clock_hour.png b/clusterApp/Res/image/module_clock_hour.png
similarity index 100%
rename from insDavi2.0/Res/image/module_clock_hour.png
rename to clusterApp/Res/image/module_clock_hour.png
diff --git a/insDavi2.0/Res/image/module_clock_minute.png b/clusterApp/Res/image/module_clock_minute.png
similarity index 100%
rename from insDavi2.0/Res/image/module_clock_minute.png
rename to clusterApp/Res/image/module_clock_minute.png
diff --git a/insDavi2.0/Res/image/module_clock_shadow.png b/clusterApp/Res/image/module_clock_shadow.png
similarity index 100%
rename from insDavi2.0/Res/image/module_clock_shadow.png
rename to clusterApp/Res/image/module_clock_shadow.png
diff --git a/insDavi2.0/Res/image/module_energy_cost_avg_unit.png b/clusterApp/Res/image/module_energy_cost_avg_unit.png
similarity index 100%
rename from insDavi2.0/Res/image/module_energy_cost_avg_unit.png
rename to clusterApp/Res/image/module_energy_cost_avg_unit.png
diff --git a/insDavi2.0/Res/image/module_energy_cost_bar_negative.png b/clusterApp/Res/image/module_energy_cost_bar_negative.png
similarity index 100%
rename from insDavi2.0/Res/image/module_energy_cost_bar_negative.png
rename to clusterApp/Res/image/module_energy_cost_bar_negative.png
diff --git a/insDavi2.0/Res/image/module_energy_cost_bar_positive.png b/clusterApp/Res/image/module_energy_cost_bar_positive.png
similarity index 100%
rename from insDavi2.0/Res/image/module_energy_cost_bar_positive.png
rename to clusterApp/Res/image/module_energy_cost_bar_positive.png
diff --git a/insDavi2.0/Res/image/module_energy_cost_bar_zero.png b/clusterApp/Res/image/module_energy_cost_bar_zero.png
similarity index 100%
rename from insDavi2.0/Res/image/module_energy_cost_bar_zero.png
rename to clusterApp/Res/image/module_energy_cost_bar_zero.png
diff --git a/insDavi2.0/Res/image/module_energy_cost_bg.png b/clusterApp/Res/image/module_energy_cost_bg.png
similarity index 100%
rename from insDavi2.0/Res/image/module_energy_cost_bg.png
rename to clusterApp/Res/image/module_energy_cost_bg.png
diff --git a/insDavi2.0/Res/image/module_energy_cost_cursor.png b/clusterApp/Res/image/module_energy_cost_cursor.png
similarity index 100%
rename from insDavi2.0/Res/image/module_energy_cost_cursor.png
rename to clusterApp/Res/image/module_energy_cost_cursor.png
diff --git a/insDavi2.0/Res/image/module_energy_cost_graph_line_bottom.png b/clusterApp/Res/image/module_energy_cost_graph_line_bottom.png
similarity index 100%
rename from insDavi2.0/Res/image/module_energy_cost_graph_line_bottom.png
rename to clusterApp/Res/image/module_energy_cost_graph_line_bottom.png
diff --git a/insDavi2.0/Res/image/module_energy_cost_graph_line_zero.png b/clusterApp/Res/image/module_energy_cost_graph_line_zero.png
similarity index 100%
rename from insDavi2.0/Res/image/module_energy_cost_graph_line_zero.png
rename to clusterApp/Res/image/module_energy_cost_graph_line_zero.png
diff --git a/insDavi2.0/Res/image/module_energy_cost_power_cursor.png b/clusterApp/Res/image/module_energy_cost_power_cursor.png
similarity index 100%
rename from insDavi2.0/Res/image/module_energy_cost_power_cursor.png
rename to clusterApp/Res/image/module_energy_cost_power_cursor.png
diff --git a/insDavi2.0/Res/image/module_energy_cost_shadow.png b/clusterApp/Res/image/module_energy_cost_shadow.png
similarity index 100%
rename from insDavi2.0/Res/image/module_energy_cost_shadow.png
rename to clusterApp/Res/image/module_energy_cost_shadow.png
diff --git a/insDavi2.0/Res/image/module_media_black_tape.png b/clusterApp/Res/image/module_media_black_tape.png
similarity index 100%
rename from insDavi2.0/Res/image/module_media_black_tape.png
rename to clusterApp/Res/image/module_media_black_tape.png
diff --git a/insDavi2.0/Res/image/module_media_cover_fm_default.png b/clusterApp/Res/image/module_media_cover_fm_default.png
similarity index 100%
rename from insDavi2.0/Res/image/module_media_cover_fm_default.png
rename to clusterApp/Res/image/module_media_cover_fm_default.png
diff --git a/insDavi2.0/Res/image/module_media_cover_music_default.png b/clusterApp/Res/image/module_media_cover_music_default.png
similarity index 100%
rename from insDavi2.0/Res/image/module_media_cover_music_default.png
rename to clusterApp/Res/image/module_media_cover_music_default.png
diff --git a/insDavi2.0/Res/image/module_media_cover_netbook_default.png b/clusterApp/Res/image/module_media_cover_netbook_default.png
similarity index 100%
rename from insDavi2.0/Res/image/module_media_cover_netbook_default.png
rename to clusterApp/Res/image/module_media_cover_netbook_default.png
diff --git a/insDavi2.0/Res/image/module_media_fm_bg.png b/clusterApp/Res/image/module_media_fm_bg.png
similarity index 100%
rename from insDavi2.0/Res/image/module_media_fm_bg.png
rename to clusterApp/Res/image/module_media_fm_bg.png
diff --git a/insDavi2.0/Res/image/module_media_progress_bar.png b/clusterApp/Res/image/module_media_progress_bar.png
similarity index 100%
rename from insDavi2.0/Res/image/module_media_progress_bar.png
rename to clusterApp/Res/image/module_media_progress_bar.png
diff --git a/insDavi2.0/Res/image/module_media_progress_bar_bg.png b/clusterApp/Res/image/module_media_progress_bar_bg.png
similarity index 100%
rename from insDavi2.0/Res/image/module_media_progress_bar_bg.png
rename to clusterApp/Res/image/module_media_progress_bar_bg.png
diff --git a/insDavi2.0/Res/image/module_media_progress_cursor.png b/clusterApp/Res/image/module_media_progress_cursor.png
similarity index 100%
rename from insDavi2.0/Res/image/module_media_progress_cursor.png
rename to clusterApp/Res/image/module_media_progress_cursor.png
diff --git a/insDavi2.0/Res/image/module_media_shadow.png b/clusterApp/Res/image/module_media_shadow.png
similarity index 100%
rename from insDavi2.0/Res/image/module_media_shadow.png
rename to clusterApp/Res/image/module_media_shadow.png
diff --git a/insDavi2.0/Res/image/module_phone_icon_incall_answer.png b/clusterApp/Res/image/module_phone_icon_incall_answer.png
similarity index 100%
rename from insDavi2.0/Res/image/module_phone_icon_incall_answer.png
rename to clusterApp/Res/image/module_phone_icon_incall_answer.png
diff --git a/insDavi2.0/Res/image/module_phone_icon_incall_hangup.png b/clusterApp/Res/image/module_phone_icon_incall_hangup.png
similarity index 100%
rename from insDavi2.0/Res/image/module_phone_icon_incall_hangup.png
rename to clusterApp/Res/image/module_phone_icon_incall_hangup.png
diff --git a/insDavi2.0/Res/image/module_phone_icon_incall_mute.png b/clusterApp/Res/image/module_phone_icon_incall_mute.png
similarity index 100%
rename from insDavi2.0/Res/image/module_phone_icon_incall_mute.png
rename to clusterApp/Res/image/module_phone_icon_incall_mute.png
diff --git a/insDavi2.0/Res/image/module_phone_icon_waiting.png b/clusterApp/Res/image/module_phone_icon_waiting.png
similarity index 100%
rename from insDavi2.0/Res/image/module_phone_icon_waiting.png
rename to clusterApp/Res/image/module_phone_icon_waiting.png
diff --git a/insDavi2.0/Res/image/module_phone_incall_bg_new.png b/clusterApp/Res/image/module_phone_incall_bg_new.png
similarity index 100%
rename from insDavi2.0/Res/image/module_phone_incall_bg_new.png
rename to clusterApp/Res/image/module_phone_incall_bg_new.png
diff --git a/insDavi2.0/Res/image/module_phone_list_bg.png b/clusterApp/Res/image/module_phone_list_bg.png
similarity index 100%
rename from insDavi2.0/Res/image/module_phone_list_bg.png
rename to clusterApp/Res/image/module_phone_list_bg.png
diff --git a/insDavi2.0/Res/image/module_phone_list_select_dec.png b/clusterApp/Res/image/module_phone_list_select_dec.png
similarity index 100%
rename from insDavi2.0/Res/image/module_phone_list_select_dec.png
rename to clusterApp/Res/image/module_phone_list_select_dec.png
diff --git a/insDavi2.0/Res/image/module_phone_shadow.png b/clusterApp/Res/image/module_phone_shadow.png
similarity index 100%
rename from insDavi2.0/Res/image/module_phone_shadow.png
rename to clusterApp/Res/image/module_phone_shadow.png
diff --git a/insDavi2.0/Res/image/module_phone_speaking_bg.png b/clusterApp/Res/image/module_phone_speaking_bg.png
similarity index 100%
rename from insDavi2.0/Res/image/module_phone_speaking_bg.png
rename to clusterApp/Res/image/module_phone_speaking_bg.png
diff --git a/insDavi2.0/Res/image/module_phone_tips_list_loading.png b/clusterApp/Res/image/module_phone_tips_list_loading.png
similarity index 100%
rename from insDavi2.0/Res/image/module_phone_tips_list_loading.png
rename to clusterApp/Res/image/module_phone_tips_list_loading.png
diff --git a/insDavi2.0/Res/image/module_phone_tips_no_record.png b/clusterApp/Res/image/module_phone_tips_no_record.png
similarity index 100%
rename from insDavi2.0/Res/image/module_phone_tips_no_record.png
rename to clusterApp/Res/image/module_phone_tips_no_record.png
diff --git a/insDavi2.0/Res/image/module_phone_tips_unavailable.png b/clusterApp/Res/image/module_phone_tips_unavailable.png
similarity index 100%
rename from insDavi2.0/Res/image/module_phone_tips_unavailable.png
rename to clusterApp/Res/image/module_phone_tips_unavailable.png
diff --git a/insDavi2.0/Res/image/module_trip_bg.png b/clusterApp/Res/image/module_trip_bg.png
similarity index 100%
rename from insDavi2.0/Res/image/module_trip_bg.png
rename to clusterApp/Res/image/module_trip_bg.png
diff --git a/insDavi2.0/Res/image/module_trip_shadow.png b/clusterApp/Res/image/module_trip_shadow.png
similarity index 100%
rename from insDavi2.0/Res/image/module_trip_shadow.png
rename to clusterApp/Res/image/module_trip_shadow.png
diff --git a/insDavi2.0/Res/image/module_vehicle_shadow.png b/clusterApp/Res/image/module_vehicle_shadow.png
similarity index 100%
rename from insDavi2.0/Res/image/module_vehicle_shadow.png
rename to clusterApp/Res/image/module_vehicle_shadow.png
diff --git a/insDavi2.0/Res/image/module_vehicle_status_backtrunk_close.png b/clusterApp/Res/image/module_vehicle_status_backtrunk_close.png
similarity index 100%
rename from insDavi2.0/Res/image/module_vehicle_status_backtrunk_close.png
rename to clusterApp/Res/image/module_vehicle_status_backtrunk_close.png
diff --git a/insDavi2.0/Res/image/module_vehicle_status_backtrunk_open.png b/clusterApp/Res/image/module_vehicle_status_backtrunk_open.png
similarity index 100%
rename from insDavi2.0/Res/image/module_vehicle_status_backtrunk_open.png
rename to clusterApp/Res/image/module_vehicle_status_backtrunk_open.png
diff --git a/insDavi2.0/Res/image/module_vehicle_status_body.png b/clusterApp/Res/image/module_vehicle_status_body.png
similarity index 100%
rename from insDavi2.0/Res/image/module_vehicle_status_body.png
rename to clusterApp/Res/image/module_vehicle_status_body.png
diff --git a/insDavi2.0/Res/image/module_vehicle_status_fronttrunk_close.png b/clusterApp/Res/image/module_vehicle_status_fronttrunk_close.png
similarity index 100%
rename from insDavi2.0/Res/image/module_vehicle_status_fronttrunk_close.png
rename to clusterApp/Res/image/module_vehicle_status_fronttrunk_close.png
diff --git a/insDavi2.0/Res/image/module_vehicle_status_fronttrunk_open.png b/clusterApp/Res/image/module_vehicle_status_fronttrunk_open.png
similarity index 100%
rename from insDavi2.0/Res/image/module_vehicle_status_fronttrunk_open.png
rename to clusterApp/Res/image/module_vehicle_status_fronttrunk_open.png
diff --git a/insDavi2.0/Res/image/module_vehicle_status_lbdoor_close.png b/clusterApp/Res/image/module_vehicle_status_lbdoor_close.png
similarity index 100%
rename from insDavi2.0/Res/image/module_vehicle_status_lbdoor_close.png
rename to clusterApp/Res/image/module_vehicle_status_lbdoor_close.png
diff --git a/insDavi2.0/Res/image/module_vehicle_status_lbdoor_open.png b/clusterApp/Res/image/module_vehicle_status_lbdoor_open.png
similarity index 100%
rename from insDavi2.0/Res/image/module_vehicle_status_lbdoor_open.png
rename to clusterApp/Res/image/module_vehicle_status_lbdoor_open.png
diff --git a/insDavi2.0/Res/image/module_vehicle_status_lfdoor_close.png b/clusterApp/Res/image/module_vehicle_status_lfdoor_close.png
similarity index 100%
rename from insDavi2.0/Res/image/module_vehicle_status_lfdoor_close.png
rename to clusterApp/Res/image/module_vehicle_status_lfdoor_close.png
diff --git a/insDavi2.0/Res/image/module_vehicle_status_lfdoor_open.png b/clusterApp/Res/image/module_vehicle_status_lfdoor_open.png
similarity index 100%
rename from insDavi2.0/Res/image/module_vehicle_status_lfdoor_open.png
rename to clusterApp/Res/image/module_vehicle_status_lfdoor_open.png
diff --git a/insDavi2.0/Res/image/module_vehicle_status_rbdoor_close.png b/clusterApp/Res/image/module_vehicle_status_rbdoor_close.png
similarity index 100%
rename from insDavi2.0/Res/image/module_vehicle_status_rbdoor_close.png
rename to clusterApp/Res/image/module_vehicle_status_rbdoor_close.png
diff --git a/insDavi2.0/Res/image/module_vehicle_status_rbdoor_open.png b/clusterApp/Res/image/module_vehicle_status_rbdoor_open.png
similarity index 100%
rename from insDavi2.0/Res/image/module_vehicle_status_rbdoor_open.png
rename to clusterApp/Res/image/module_vehicle_status_rbdoor_open.png
diff --git a/insDavi2.0/Res/image/module_vehicle_status_rfdoor_close.png b/clusterApp/Res/image/module_vehicle_status_rfdoor_close.png
similarity index 100%
rename from insDavi2.0/Res/image/module_vehicle_status_rfdoor_close.png
rename to clusterApp/Res/image/module_vehicle_status_rfdoor_close.png
diff --git a/insDavi2.0/Res/image/module_vehicle_status_rfdoor_open.png b/clusterApp/Res/image/module_vehicle_status_rfdoor_open.png
similarity index 100%
rename from insDavi2.0/Res/image/module_vehicle_status_rfdoor_open.png
rename to clusterApp/Res/image/module_vehicle_status_rfdoor_open.png
diff --git a/insDavi2.0/Res/image/module_vehicle_status_shadow.png b/clusterApp/Res/image/module_vehicle_status_shadow.png
similarity index 100%
rename from insDavi2.0/Res/image/module_vehicle_status_shadow.png
rename to clusterApp/Res/image/module_vehicle_status_shadow.png
diff --git a/insDavi2.0/Res/image/module_vehicle_status_wheel_alarm.png b/clusterApp/Res/image/module_vehicle_status_wheel_alarm.png
similarity index 100%
rename from insDavi2.0/Res/image/module_vehicle_status_wheel_alarm.png
rename to clusterApp/Res/image/module_vehicle_status_wheel_alarm.png
diff --git a/insDavi2.0/Res/image/module_vehicle_status_wheel_alarm_add.png b/clusterApp/Res/image/module_vehicle_status_wheel_alarm_add.png
similarity index 100%
rename from insDavi2.0/Res/image/module_vehicle_status_wheel_alarm_add.png
rename to clusterApp/Res/image/module_vehicle_status_wheel_alarm_add.png
diff --git a/insDavi2.0/Res/image/module_vehicle_status_wheel_normal.png b/clusterApp/Res/image/module_vehicle_status_wheel_normal.png
similarity index 100%
rename from insDavi2.0/Res/image/module_vehicle_status_wheel_normal.png
rename to clusterApp/Res/image/module_vehicle_status_wheel_normal.png
diff --git a/insDavi2.0/Res/image/nav_icon_destination.tga b/clusterApp/Res/image/nav_icon_destination.tga
similarity index 100%
rename from insDavi2.0/Res/image/nav_icon_destination.tga
rename to clusterApp/Res/image/nav_icon_destination.tga
diff --git a/insDavi2.0/Res/image/nav_icon_enter_roundabout.tga b/clusterApp/Res/image/nav_icon_enter_roundabout.tga
similarity index 100%
rename from insDavi2.0/Res/image/nav_icon_enter_roundabout.tga
rename to clusterApp/Res/image/nav_icon_enter_roundabout.tga
diff --git a/insDavi2.0/Res/image/nav_icon_enter_toll_station.tga b/clusterApp/Res/image/nav_icon_enter_toll_station.tga
similarity index 100%
rename from insDavi2.0/Res/image/nav_icon_enter_toll_station.tga
rename to clusterApp/Res/image/nav_icon_enter_toll_station.tga
diff --git a/insDavi2.0/Res/image/nav_icon_enter_tunnel.tga b/clusterApp/Res/image/nav_icon_enter_tunnel.tga
similarity index 100%
rename from insDavi2.0/Res/image/nav_icon_enter_tunnel.tga
rename to clusterApp/Res/image/nav_icon_enter_tunnel.tga
diff --git a/insDavi2.0/Res/image/nav_icon_exit_roundabout.tga b/clusterApp/Res/image/nav_icon_exit_roundabout.tga
similarity index 100%
rename from insDavi2.0/Res/image/nav_icon_exit_roundabout.tga
rename to clusterApp/Res/image/nav_icon_exit_roundabout.tga
diff --git a/insDavi2.0/Res/image/nav_icon_go_straight.tga b/clusterApp/Res/image/nav_icon_go_straight.tga
similarity index 100%
rename from insDavi2.0/Res/image/nav_icon_go_straight.tga
rename to clusterApp/Res/image/nav_icon_go_straight.tga
diff --git a/insDavi2.0/Res/image/nav_icon_left_back.tga b/clusterApp/Res/image/nav_icon_left_back.tga
similarity index 100%
rename from insDavi2.0/Res/image/nav_icon_left_back.tga
rename to clusterApp/Res/image/nav_icon_left_back.tga
diff --git a/insDavi2.0/Res/image/nav_icon_left_front.tga b/clusterApp/Res/image/nav_icon_left_front.tga
similarity index 100%
rename from insDavi2.0/Res/image/nav_icon_left_front.tga
rename to clusterApp/Res/image/nav_icon_left_front.tga
diff --git a/insDavi2.0/Res/image/nav_icon_nav_disable.tga b/clusterApp/Res/image/nav_icon_nav_disable.tga
similarity index 100%
rename from insDavi2.0/Res/image/nav_icon_nav_disable.tga
rename to clusterApp/Res/image/nav_icon_nav_disable.tga
diff --git a/insDavi2.0/Res/image/nav_icon_right_back.tga b/clusterApp/Res/image/nav_icon_right_back.tga
similarity index 100%
rename from insDavi2.0/Res/image/nav_icon_right_back.tga
rename to clusterApp/Res/image/nav_icon_right_back.tga
diff --git a/insDavi2.0/Res/image/nav_icon_right_front.tga b/clusterApp/Res/image/nav_icon_right_front.tga
similarity index 100%
rename from insDavi2.0/Res/image/nav_icon_right_front.tga
rename to clusterApp/Res/image/nav_icon_right_front.tga
diff --git a/insDavi2.0/Res/image/nav_icon_turn_left.tga b/clusterApp/Res/image/nav_icon_turn_left.tga
similarity index 100%
rename from insDavi2.0/Res/image/nav_icon_turn_left.tga
rename to clusterApp/Res/image/nav_icon_turn_left.tga
diff --git a/insDavi2.0/Res/image/nav_icon_turn_right.tga b/clusterApp/Res/image/nav_icon_turn_right.tga
similarity index 100%
rename from insDavi2.0/Res/image/nav_icon_turn_right.tga
rename to clusterApp/Res/image/nav_icon_turn_right.tga
diff --git a/insDavi2.0/Res/image/nav_icon_turn_round.tga b/clusterApp/Res/image/nav_icon_turn_round.tga
similarity index 100%
rename from insDavi2.0/Res/image/nav_icon_turn_round.tga
rename to clusterApp/Res/image/nav_icon_turn_round.tga
diff --git a/insDavi2.0/Res/image/nav_module_shadow.tga b/clusterApp/Res/image/nav_module_shadow.tga
similarity index 100%
rename from insDavi2.0/Res/image/nav_module_shadow.tga
rename to clusterApp/Res/image/nav_module_shadow.tga
diff --git a/insDavi2.0/Res/image/nav_tips_arrive_destination.tga b/clusterApp/Res/image/nav_tips_arrive_destination.tga
similarity index 100%
rename from insDavi2.0/Res/image/nav_tips_arrive_destination.tga
rename to clusterApp/Res/image/nav_tips_arrive_destination.tga
diff --git a/insDavi2.0/Res/image/nav_tips_cost_left.tga b/clusterApp/Res/image/nav_tips_cost_left.tga
similarity index 100%
rename from insDavi2.0/Res/image/nav_tips_cost_left.tga
rename to clusterApp/Res/image/nav_tips_cost_left.tga
diff --git a/insDavi2.0/Res/image/nav_tips_disable.tga b/clusterApp/Res/image/nav_tips_disable.tga
similarity index 100%
rename from insDavi2.0/Res/image/nav_tips_disable.tga
rename to clusterApp/Res/image/nav_tips_disable.tga
diff --git a/insDavi2.0/Res/image/nav_tips_next_enter.tga b/clusterApp/Res/image/nav_tips_next_enter.tga
similarity index 100%
rename from insDavi2.0/Res/image/nav_tips_next_enter.tga
rename to clusterApp/Res/image/nav_tips_next_enter.tga
diff --git a/insDavi2.0/Res/image/nav_unit_next_distance_km.tga b/clusterApp/Res/image/nav_unit_next_distance_km.tga
similarity index 100%
rename from insDavi2.0/Res/image/nav_unit_next_distance_km.tga
rename to clusterApp/Res/image/nav_unit_next_distance_km.tga
diff --git a/insDavi2.0/Res/image/nav_unit_next_distance_m.tga b/clusterApp/Res/image/nav_unit_next_distance_m.tga
similarity index 100%
rename from insDavi2.0/Res/image/nav_unit_next_distance_m.tga
rename to clusterApp/Res/image/nav_unit_next_distance_m.tga
diff --git a/insDavi2.0/Res/image/parking_car_all_blue_base.png b/clusterApp/Res/image/parking_car_all_blue_base.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_all_blue_base.png
rename to clusterApp/Res/image/parking_car_all_blue_base.png
diff --git a/insDavi2.0/Res/image/parking_car_all_blue_camer.png b/clusterApp/Res/image/parking_car_all_blue_camer.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_all_blue_camer.png
rename to clusterApp/Res/image/parking_car_all_blue_camer.png
diff --git a/insDavi2.0/Res/image/parking_car_all_blue_trunk_close.png b/clusterApp/Res/image/parking_car_all_blue_trunk_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_all_blue_trunk_close.png
rename to clusterApp/Res/image/parking_car_all_blue_trunk_close.png
diff --git a/insDavi2.0/Res/image/parking_car_all_blue_trunk_open.png b/clusterApp/Res/image/parking_car_all_blue_trunk_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_all_blue_trunk_open.png
rename to clusterApp/Res/image/parking_car_all_blue_trunk_open.png
diff --git a/insDavi2.0/Res/image/parking_car_all_gray_base.png b/clusterApp/Res/image/parking_car_all_gray_base.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_all_gray_base.png
rename to clusterApp/Res/image/parking_car_all_gray_base.png
diff --git a/insDavi2.0/Res/image/parking_car_all_gray_camer.png b/clusterApp/Res/image/parking_car_all_gray_camer.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_all_gray_camer.png
rename to clusterApp/Res/image/parking_car_all_gray_camer.png
diff --git a/insDavi2.0/Res/image/parking_car_all_gray_trunk_close.png b/clusterApp/Res/image/parking_car_all_gray_trunk_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_all_gray_trunk_close.png
rename to clusterApp/Res/image/parking_car_all_gray_trunk_close.png
diff --git a/insDavi2.0/Res/image/parking_car_all_gray_trunk_open.png b/clusterApp/Res/image/parking_car_all_gray_trunk_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_all_gray_trunk_open.png
rename to clusterApp/Res/image/parking_car_all_gray_trunk_open.png
diff --git a/insDavi2.0/Res/image/parking_car_all_red_base.png b/clusterApp/Res/image/parking_car_all_red_base.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_all_red_base.png
rename to clusterApp/Res/image/parking_car_all_red_base.png
diff --git a/insDavi2.0/Res/image/parking_car_all_red_camer.png b/clusterApp/Res/image/parking_car_all_red_camer.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_all_red_camer.png
rename to clusterApp/Res/image/parking_car_all_red_camer.png
diff --git a/insDavi2.0/Res/image/parking_car_all_red_trunk_close.png b/clusterApp/Res/image/parking_car_all_red_trunk_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_all_red_trunk_close.png
rename to clusterApp/Res/image/parking_car_all_red_trunk_close.png
diff --git a/insDavi2.0/Res/image/parking_car_all_red_trunk_open.png b/clusterApp/Res/image/parking_car_all_red_trunk_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_all_red_trunk_open.png
rename to clusterApp/Res/image/parking_car_all_red_trunk_open.png
diff --git a/insDavi2.0/Res/image/parking_car_blue_base.png b/clusterApp/Res/image/parking_car_blue_base.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_blue_base.png
rename to clusterApp/Res/image/parking_car_blue_base.png
diff --git a/insDavi2.0/Res/image/parking_car_blue_camer.png b/clusterApp/Res/image/parking_car_blue_camer.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_blue_camer.png
rename to clusterApp/Res/image/parking_car_blue_camer.png
diff --git a/insDavi2.0/Res/image/parking_car_blue_chargeport_close.png b/clusterApp/Res/image/parking_car_blue_chargeport_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_blue_chargeport_close.png
rename to clusterApp/Res/image/parking_car_blue_chargeport_close.png
diff --git a/insDavi2.0/Res/image/parking_car_blue_chargeport_open.png b/clusterApp/Res/image/parking_car_blue_chargeport_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_blue_chargeport_open.png
rename to clusterApp/Res/image/parking_car_blue_chargeport_open.png
diff --git a/insDavi2.0/Res/image/parking_car_blue_enginetop_close.png b/clusterApp/Res/image/parking_car_blue_enginetop_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_blue_enginetop_close.png
rename to clusterApp/Res/image/parking_car_blue_enginetop_close.png
diff --git a/insDavi2.0/Res/image/parking_car_blue_enginetop_open.png b/clusterApp/Res/image/parking_car_blue_enginetop_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_blue_enginetop_open.png
rename to clusterApp/Res/image/parking_car_blue_enginetop_open.png
diff --git a/insDavi2.0/Res/image/parking_car_blue_lbdoor_close.png b/clusterApp/Res/image/parking_car_blue_lbdoor_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_blue_lbdoor_close.png
rename to clusterApp/Res/image/parking_car_blue_lbdoor_close.png
diff --git a/insDavi2.0/Res/image/parking_car_blue_lbdoor_open.png b/clusterApp/Res/image/parking_car_blue_lbdoor_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_blue_lbdoor_open.png
rename to clusterApp/Res/image/parking_car_blue_lbdoor_open.png
diff --git a/insDavi2.0/Res/image/parking_car_blue_lfdoor_close.png b/clusterApp/Res/image/parking_car_blue_lfdoor_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_blue_lfdoor_close.png
rename to clusterApp/Res/image/parking_car_blue_lfdoor_close.png
diff --git a/insDavi2.0/Res/image/parking_car_blue_lfdoor_open.png b/clusterApp/Res/image/parking_car_blue_lfdoor_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_blue_lfdoor_open.png
rename to clusterApp/Res/image/parking_car_blue_lfdoor_open.png
diff --git a/insDavi2.0/Res/image/parking_car_blue_rbdoor_close.png b/clusterApp/Res/image/parking_car_blue_rbdoor_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_blue_rbdoor_close.png
rename to clusterApp/Res/image/parking_car_blue_rbdoor_close.png
diff --git a/insDavi2.0/Res/image/parking_car_blue_rbdoor_open.png b/clusterApp/Res/image/parking_car_blue_rbdoor_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_blue_rbdoor_open.png
rename to clusterApp/Res/image/parking_car_blue_rbdoor_open.png
diff --git a/insDavi2.0/Res/image/parking_car_blue_rfdoor_close.png b/clusterApp/Res/image/parking_car_blue_rfdoor_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_blue_rfdoor_close.png
rename to clusterApp/Res/image/parking_car_blue_rfdoor_close.png
diff --git a/insDavi2.0/Res/image/parking_car_blue_rfdoor_open.png b/clusterApp/Res/image/parking_car_blue_rfdoor_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_blue_rfdoor_open.png
rename to clusterApp/Res/image/parking_car_blue_rfdoor_open.png
diff --git a/insDavi2.0/Res/image/parking_car_blue_trunk_close.png b/clusterApp/Res/image/parking_car_blue_trunk_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_blue_trunk_close.png
rename to clusterApp/Res/image/parking_car_blue_trunk_close.png
diff --git a/insDavi2.0/Res/image/parking_car_blue_trunk_open.png b/clusterApp/Res/image/parking_car_blue_trunk_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_blue_trunk_open.png
rename to clusterApp/Res/image/parking_car_blue_trunk_open.png
diff --git a/insDavi2.0/Res/image/parking_car_darkgray_base.png b/clusterApp/Res/image/parking_car_darkgray_base.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_darkgray_base.png
rename to clusterApp/Res/image/parking_car_darkgray_base.png
diff --git a/insDavi2.0/Res/image/parking_car_darkgray_camer.png b/clusterApp/Res/image/parking_car_darkgray_camer.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_darkgray_camer.png
rename to clusterApp/Res/image/parking_car_darkgray_camer.png
diff --git a/insDavi2.0/Res/image/parking_car_darkgray_chargeport_close.png b/clusterApp/Res/image/parking_car_darkgray_chargeport_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_darkgray_chargeport_close.png
rename to clusterApp/Res/image/parking_car_darkgray_chargeport_close.png
diff --git a/insDavi2.0/Res/image/parking_car_darkgray_chargeport_open.png b/clusterApp/Res/image/parking_car_darkgray_chargeport_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_darkgray_chargeport_open.png
rename to clusterApp/Res/image/parking_car_darkgray_chargeport_open.png
diff --git a/insDavi2.0/Res/image/parking_car_darkgray_enginetop_close.png b/clusterApp/Res/image/parking_car_darkgray_enginetop_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_darkgray_enginetop_close.png
rename to clusterApp/Res/image/parking_car_darkgray_enginetop_close.png
diff --git a/insDavi2.0/Res/image/parking_car_darkgray_enginetop_open.png b/clusterApp/Res/image/parking_car_darkgray_enginetop_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_darkgray_enginetop_open.png
rename to clusterApp/Res/image/parking_car_darkgray_enginetop_open.png
diff --git a/insDavi2.0/Res/image/parking_car_darkgray_lbdoor_close.png b/clusterApp/Res/image/parking_car_darkgray_lbdoor_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_darkgray_lbdoor_close.png
rename to clusterApp/Res/image/parking_car_darkgray_lbdoor_close.png
diff --git a/insDavi2.0/Res/image/parking_car_darkgray_lbdoor_open.png b/clusterApp/Res/image/parking_car_darkgray_lbdoor_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_darkgray_lbdoor_open.png
rename to clusterApp/Res/image/parking_car_darkgray_lbdoor_open.png
diff --git a/insDavi2.0/Res/image/parking_car_darkgray_lfdoor_close.png b/clusterApp/Res/image/parking_car_darkgray_lfdoor_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_darkgray_lfdoor_close.png
rename to clusterApp/Res/image/parking_car_darkgray_lfdoor_close.png
diff --git a/insDavi2.0/Res/image/parking_car_darkgray_lfdoor_open.png b/clusterApp/Res/image/parking_car_darkgray_lfdoor_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_darkgray_lfdoor_open.png
rename to clusterApp/Res/image/parking_car_darkgray_lfdoor_open.png
diff --git a/insDavi2.0/Res/image/parking_car_darkgray_rbdoor_close.png b/clusterApp/Res/image/parking_car_darkgray_rbdoor_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_darkgray_rbdoor_close.png
rename to clusterApp/Res/image/parking_car_darkgray_rbdoor_close.png
diff --git a/insDavi2.0/Res/image/parking_car_darkgray_rbdoor_open.png b/clusterApp/Res/image/parking_car_darkgray_rbdoor_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_darkgray_rbdoor_open.png
rename to clusterApp/Res/image/parking_car_darkgray_rbdoor_open.png
diff --git a/insDavi2.0/Res/image/parking_car_darkgray_rfdoor_close.png b/clusterApp/Res/image/parking_car_darkgray_rfdoor_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_darkgray_rfdoor_close.png
rename to clusterApp/Res/image/parking_car_darkgray_rfdoor_close.png
diff --git a/insDavi2.0/Res/image/parking_car_darkgray_rfdoor_open.png b/clusterApp/Res/image/parking_car_darkgray_rfdoor_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_darkgray_rfdoor_open.png
rename to clusterApp/Res/image/parking_car_darkgray_rfdoor_open.png
diff --git a/insDavi2.0/Res/image/parking_car_darkgray_trunk_close.png b/clusterApp/Res/image/parking_car_darkgray_trunk_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_darkgray_trunk_close.png
rename to clusterApp/Res/image/parking_car_darkgray_trunk_close.png
diff --git a/insDavi2.0/Res/image/parking_car_darkgray_trunk_open.png b/clusterApp/Res/image/parking_car_darkgray_trunk_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_darkgray_trunk_open.png
rename to clusterApp/Res/image/parking_car_darkgray_trunk_open.png
diff --git a/insDavi2.0/Res/image/parking_car_gray_base.png b/clusterApp/Res/image/parking_car_gray_base.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_gray_base.png
rename to clusterApp/Res/image/parking_car_gray_base.png
diff --git a/insDavi2.0/Res/image/parking_car_gray_camer.png b/clusterApp/Res/image/parking_car_gray_camer.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_gray_camer.png
rename to clusterApp/Res/image/parking_car_gray_camer.png
diff --git a/insDavi2.0/Res/image/parking_car_gray_chargeport_close.png b/clusterApp/Res/image/parking_car_gray_chargeport_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_gray_chargeport_close.png
rename to clusterApp/Res/image/parking_car_gray_chargeport_close.png
diff --git a/insDavi2.0/Res/image/parking_car_gray_chargeport_open.png b/clusterApp/Res/image/parking_car_gray_chargeport_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_gray_chargeport_open.png
rename to clusterApp/Res/image/parking_car_gray_chargeport_open.png
diff --git a/insDavi2.0/Res/image/parking_car_gray_enginetop_close.png b/clusterApp/Res/image/parking_car_gray_enginetop_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_gray_enginetop_close.png
rename to clusterApp/Res/image/parking_car_gray_enginetop_close.png
diff --git a/insDavi2.0/Res/image/parking_car_gray_enginetop_open.png b/clusterApp/Res/image/parking_car_gray_enginetop_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_gray_enginetop_open.png
rename to clusterApp/Res/image/parking_car_gray_enginetop_open.png
diff --git a/insDavi2.0/Res/image/parking_car_gray_lbdoor_close.png b/clusterApp/Res/image/parking_car_gray_lbdoor_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_gray_lbdoor_close.png
rename to clusterApp/Res/image/parking_car_gray_lbdoor_close.png
diff --git a/insDavi2.0/Res/image/parking_car_gray_lbdoor_open.png b/clusterApp/Res/image/parking_car_gray_lbdoor_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_gray_lbdoor_open.png
rename to clusterApp/Res/image/parking_car_gray_lbdoor_open.png
diff --git a/insDavi2.0/Res/image/parking_car_gray_lfdoor_close.png b/clusterApp/Res/image/parking_car_gray_lfdoor_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_gray_lfdoor_close.png
rename to clusterApp/Res/image/parking_car_gray_lfdoor_close.png
diff --git a/insDavi2.0/Res/image/parking_car_gray_lfdoor_open.png b/clusterApp/Res/image/parking_car_gray_lfdoor_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_gray_lfdoor_open.png
rename to clusterApp/Res/image/parking_car_gray_lfdoor_open.png
diff --git a/insDavi2.0/Res/image/parking_car_gray_rbdoor_close.png b/clusterApp/Res/image/parking_car_gray_rbdoor_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_gray_rbdoor_close.png
rename to clusterApp/Res/image/parking_car_gray_rbdoor_close.png
diff --git a/insDavi2.0/Res/image/parking_car_gray_rbdoor_open.png b/clusterApp/Res/image/parking_car_gray_rbdoor_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_gray_rbdoor_open.png
rename to clusterApp/Res/image/parking_car_gray_rbdoor_open.png
diff --git a/insDavi2.0/Res/image/parking_car_gray_rfdoor_close.png b/clusterApp/Res/image/parking_car_gray_rfdoor_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_gray_rfdoor_close.png
rename to clusterApp/Res/image/parking_car_gray_rfdoor_close.png
diff --git a/insDavi2.0/Res/image/parking_car_gray_rfdoor_open.png b/clusterApp/Res/image/parking_car_gray_rfdoor_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_gray_rfdoor_open.png
rename to clusterApp/Res/image/parking_car_gray_rfdoor_open.png
diff --git a/insDavi2.0/Res/image/parking_car_gray_trunk_close.png b/clusterApp/Res/image/parking_car_gray_trunk_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_gray_trunk_close.png
rename to clusterApp/Res/image/parking_car_gray_trunk_close.png
diff --git a/insDavi2.0/Res/image/parking_car_gray_trunk_open.png b/clusterApp/Res/image/parking_car_gray_trunk_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_gray_trunk_open.png
rename to clusterApp/Res/image/parking_car_gray_trunk_open.png
diff --git a/insDavi2.0/Res/image/parking_car_red_base.png b/clusterApp/Res/image/parking_car_red_base.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_red_base.png
rename to clusterApp/Res/image/parking_car_red_base.png
diff --git a/insDavi2.0/Res/image/parking_car_red_camer.png b/clusterApp/Res/image/parking_car_red_camer.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_red_camer.png
rename to clusterApp/Res/image/parking_car_red_camer.png
diff --git a/insDavi2.0/Res/image/parking_car_red_chargeport_close.png b/clusterApp/Res/image/parking_car_red_chargeport_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_red_chargeport_close.png
rename to clusterApp/Res/image/parking_car_red_chargeport_close.png
diff --git a/insDavi2.0/Res/image/parking_car_red_chargeport_open.png b/clusterApp/Res/image/parking_car_red_chargeport_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_red_chargeport_open.png
rename to clusterApp/Res/image/parking_car_red_chargeport_open.png
diff --git a/insDavi2.0/Res/image/parking_car_red_enginetop_close.png b/clusterApp/Res/image/parking_car_red_enginetop_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_red_enginetop_close.png
rename to clusterApp/Res/image/parking_car_red_enginetop_close.png
diff --git a/insDavi2.0/Res/image/parking_car_red_enginetop_open.png b/clusterApp/Res/image/parking_car_red_enginetop_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_red_enginetop_open.png
rename to clusterApp/Res/image/parking_car_red_enginetop_open.png
diff --git a/insDavi2.0/Res/image/parking_car_red_lbdoor_close.png b/clusterApp/Res/image/parking_car_red_lbdoor_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_red_lbdoor_close.png
rename to clusterApp/Res/image/parking_car_red_lbdoor_close.png
diff --git a/insDavi2.0/Res/image/parking_car_red_lbdoor_open.png b/clusterApp/Res/image/parking_car_red_lbdoor_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_red_lbdoor_open.png
rename to clusterApp/Res/image/parking_car_red_lbdoor_open.png
diff --git a/insDavi2.0/Res/image/parking_car_red_lfdoor_close.png b/clusterApp/Res/image/parking_car_red_lfdoor_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_red_lfdoor_close.png
rename to clusterApp/Res/image/parking_car_red_lfdoor_close.png
diff --git a/insDavi2.0/Res/image/parking_car_red_lfdoor_open.png b/clusterApp/Res/image/parking_car_red_lfdoor_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_red_lfdoor_open.png
rename to clusterApp/Res/image/parking_car_red_lfdoor_open.png
diff --git a/insDavi2.0/Res/image/parking_car_red_rbdoor_close.png b/clusterApp/Res/image/parking_car_red_rbdoor_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_red_rbdoor_close.png
rename to clusterApp/Res/image/parking_car_red_rbdoor_close.png
diff --git a/insDavi2.0/Res/image/parking_car_red_rbdoor_open.png b/clusterApp/Res/image/parking_car_red_rbdoor_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_red_rbdoor_open.png
rename to clusterApp/Res/image/parking_car_red_rbdoor_open.png
diff --git a/insDavi2.0/Res/image/parking_car_red_rfdoor_close.png b/clusterApp/Res/image/parking_car_red_rfdoor_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_red_rfdoor_close.png
rename to clusterApp/Res/image/parking_car_red_rfdoor_close.png
diff --git a/insDavi2.0/Res/image/parking_car_red_rfdoor_open.png b/clusterApp/Res/image/parking_car_red_rfdoor_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_red_rfdoor_open.png
rename to clusterApp/Res/image/parking_car_red_rfdoor_open.png
diff --git a/insDavi2.0/Res/image/parking_car_red_trunk_close.png b/clusterApp/Res/image/parking_car_red_trunk_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_red_trunk_close.png
rename to clusterApp/Res/image/parking_car_red_trunk_close.png
diff --git a/insDavi2.0/Res/image/parking_car_red_trunk_open.png b/clusterApp/Res/image/parking_car_red_trunk_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_red_trunk_open.png
rename to clusterApp/Res/image/parking_car_red_trunk_open.png
diff --git a/insDavi2.0/Res/image/parking_car_wheel_0.png b/clusterApp/Res/image/parking_car_wheel_0.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_wheel_0.png
rename to clusterApp/Res/image/parking_car_wheel_0.png
diff --git a/insDavi2.0/Res/image/parking_car_wheel_l30.png b/clusterApp/Res/image/parking_car_wheel_l30.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_wheel_l30.png
rename to clusterApp/Res/image/parking_car_wheel_l30.png
diff --git a/insDavi2.0/Res/image/parking_car_wheel_l45.png b/clusterApp/Res/image/parking_car_wheel_l45.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_wheel_l45.png
rename to clusterApp/Res/image/parking_car_wheel_l45.png
diff --git a/insDavi2.0/Res/image/parking_car_wheel_l60.png b/clusterApp/Res/image/parking_car_wheel_l60.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_wheel_l60.png
rename to clusterApp/Res/image/parking_car_wheel_l60.png
diff --git a/insDavi2.0/Res/image/parking_car_wheel_r30.png b/clusterApp/Res/image/parking_car_wheel_r30.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_wheel_r30.png
rename to clusterApp/Res/image/parking_car_wheel_r30.png
diff --git a/insDavi2.0/Res/image/parking_car_wheel_r45.png b/clusterApp/Res/image/parking_car_wheel_r45.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_wheel_r45.png
rename to clusterApp/Res/image/parking_car_wheel_r45.png
diff --git a/insDavi2.0/Res/image/parking_car_wheel_r60.png b/clusterApp/Res/image/parking_car_wheel_r60.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_wheel_r60.png
rename to clusterApp/Res/image/parking_car_wheel_r60.png
diff --git a/insDavi2.0/Res/image/parking_car_white_base.png b/clusterApp/Res/image/parking_car_white_base.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_white_base.png
rename to clusterApp/Res/image/parking_car_white_base.png
diff --git a/insDavi2.0/Res/image/parking_car_white_camer.png b/clusterApp/Res/image/parking_car_white_camer.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_white_camer.png
rename to clusterApp/Res/image/parking_car_white_camer.png
diff --git a/insDavi2.0/Res/image/parking_car_white_chargeport_close.png b/clusterApp/Res/image/parking_car_white_chargeport_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_white_chargeport_close.png
rename to clusterApp/Res/image/parking_car_white_chargeport_close.png
diff --git a/insDavi2.0/Res/image/parking_car_white_chargeport_open.png b/clusterApp/Res/image/parking_car_white_chargeport_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_white_chargeport_open.png
rename to clusterApp/Res/image/parking_car_white_chargeport_open.png
diff --git a/insDavi2.0/Res/image/parking_car_white_enginetop_close.png b/clusterApp/Res/image/parking_car_white_enginetop_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_white_enginetop_close.png
rename to clusterApp/Res/image/parking_car_white_enginetop_close.png
diff --git a/insDavi2.0/Res/image/parking_car_white_enginetop_open.png b/clusterApp/Res/image/parking_car_white_enginetop_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_white_enginetop_open.png
rename to clusterApp/Res/image/parking_car_white_enginetop_open.png
diff --git a/insDavi2.0/Res/image/parking_car_white_lbdoor_close.png b/clusterApp/Res/image/parking_car_white_lbdoor_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_white_lbdoor_close.png
rename to clusterApp/Res/image/parking_car_white_lbdoor_close.png
diff --git a/insDavi2.0/Res/image/parking_car_white_lbdoor_open.png b/clusterApp/Res/image/parking_car_white_lbdoor_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_white_lbdoor_open.png
rename to clusterApp/Res/image/parking_car_white_lbdoor_open.png
diff --git a/insDavi2.0/Res/image/parking_car_white_lfdoor_close.png b/clusterApp/Res/image/parking_car_white_lfdoor_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_white_lfdoor_close.png
rename to clusterApp/Res/image/parking_car_white_lfdoor_close.png
diff --git a/insDavi2.0/Res/image/parking_car_white_lfdoor_open.png b/clusterApp/Res/image/parking_car_white_lfdoor_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_white_lfdoor_open.png
rename to clusterApp/Res/image/parking_car_white_lfdoor_open.png
diff --git a/insDavi2.0/Res/image/parking_car_white_rbdoor_close.png b/clusterApp/Res/image/parking_car_white_rbdoor_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_white_rbdoor_close.png
rename to clusterApp/Res/image/parking_car_white_rbdoor_close.png
diff --git a/insDavi2.0/Res/image/parking_car_white_rbdoor_open.png b/clusterApp/Res/image/parking_car_white_rbdoor_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_white_rbdoor_open.png
rename to clusterApp/Res/image/parking_car_white_rbdoor_open.png
diff --git a/insDavi2.0/Res/image/parking_car_white_rfdoor_close.png b/clusterApp/Res/image/parking_car_white_rfdoor_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_white_rfdoor_close.png
rename to clusterApp/Res/image/parking_car_white_rfdoor_close.png
diff --git a/insDavi2.0/Res/image/parking_car_white_rfdoor_open.png b/clusterApp/Res/image/parking_car_white_rfdoor_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_white_rfdoor_open.png
rename to clusterApp/Res/image/parking_car_white_rfdoor_open.png
diff --git a/insDavi2.0/Res/image/parking_car_white_trunk_close.png b/clusterApp/Res/image/parking_car_white_trunk_close.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_white_trunk_close.png
rename to clusterApp/Res/image/parking_car_white_trunk_close.png
diff --git a/insDavi2.0/Res/image/parking_car_white_trunk_open.png b/clusterApp/Res/image/parking_car_white_trunk_open.png
similarity index 100%
rename from insDavi2.0/Res/image/parking_car_white_trunk_open.png
rename to clusterApp/Res/image/parking_car_white_trunk_open.png
diff --git a/insDavi2.0/Res/image/radar_car_front_all_ red.png b/clusterApp/Res/image/radar_car_front_all_ red.png
similarity index 100%
rename from insDavi2.0/Res/image/radar_car_front_all_ red.png
rename to clusterApp/Res/image/radar_car_front_all_ red.png
diff --git a/insDavi2.0/Res/image/radar_car_front_all_blue.png b/clusterApp/Res/image/radar_car_front_all_blue.png
similarity index 100%
rename from insDavi2.0/Res/image/radar_car_front_all_blue.png
rename to clusterApp/Res/image/radar_car_front_all_blue.png
diff --git a/insDavi2.0/Res/image/radar_car_front_all_gray.png b/clusterApp/Res/image/radar_car_front_all_gray.png
similarity index 100%
rename from insDavi2.0/Res/image/radar_car_front_all_gray.png
rename to clusterApp/Res/image/radar_car_front_all_gray.png
diff --git a/insDavi2.0/Res/image/radar_car_front_blue.png b/clusterApp/Res/image/radar_car_front_blue.png
similarity index 100%
rename from insDavi2.0/Res/image/radar_car_front_blue.png
rename to clusterApp/Res/image/radar_car_front_blue.png
diff --git a/insDavi2.0/Res/image/radar_car_front_dark_grey.png b/clusterApp/Res/image/radar_car_front_dark_grey.png
similarity index 100%
rename from insDavi2.0/Res/image/radar_car_front_dark_grey.png
rename to clusterApp/Res/image/radar_car_front_dark_grey.png
diff --git a/insDavi2.0/Res/image/radar_car_front_grey.png b/clusterApp/Res/image/radar_car_front_grey.png
similarity index 100%
rename from insDavi2.0/Res/image/radar_car_front_grey.png
rename to clusterApp/Res/image/radar_car_front_grey.png
diff --git a/insDavi2.0/Res/image/radar_car_front_red.png b/clusterApp/Res/image/radar_car_front_red.png
similarity index 100%
rename from insDavi2.0/Res/image/radar_car_front_red.png
rename to clusterApp/Res/image/radar_car_front_red.png
diff --git a/insDavi2.0/Res/image/radar_car_front_white.png b/clusterApp/Res/image/radar_car_front_white.png
similarity index 100%
rename from insDavi2.0/Res/image/radar_car_front_white.png
rename to clusterApp/Res/image/radar_car_front_white.png
diff --git a/insDavi2.0/Res/image/radar_car_rear_all_blue.png b/clusterApp/Res/image/radar_car_rear_all_blue.png
similarity index 100%
rename from insDavi2.0/Res/image/radar_car_rear_all_blue.png
rename to clusterApp/Res/image/radar_car_rear_all_blue.png
diff --git a/insDavi2.0/Res/image/radar_car_rear_all_gray.png b/clusterApp/Res/image/radar_car_rear_all_gray.png
similarity index 100%
rename from insDavi2.0/Res/image/radar_car_rear_all_gray.png
rename to clusterApp/Res/image/radar_car_rear_all_gray.png
diff --git a/insDavi2.0/Res/image/radar_car_rear_all_red.png b/clusterApp/Res/image/radar_car_rear_all_red.png
similarity index 100%
rename from insDavi2.0/Res/image/radar_car_rear_all_red.png
rename to clusterApp/Res/image/radar_car_rear_all_red.png
diff --git a/insDavi2.0/Res/image/radar_car_rear_blue.png b/clusterApp/Res/image/radar_car_rear_blue.png
similarity index 100%
rename from insDavi2.0/Res/image/radar_car_rear_blue.png
rename to clusterApp/Res/image/radar_car_rear_blue.png
diff --git a/insDavi2.0/Res/image/radar_car_rear_dark_grey.png b/clusterApp/Res/image/radar_car_rear_dark_grey.png
similarity index 100%
rename from insDavi2.0/Res/image/radar_car_rear_dark_grey.png
rename to clusterApp/Res/image/radar_car_rear_dark_grey.png
diff --git a/insDavi2.0/Res/image/radar_car_rear_grey.png b/clusterApp/Res/image/radar_car_rear_grey.png
similarity index 100%
rename from insDavi2.0/Res/image/radar_car_rear_grey.png
rename to clusterApp/Res/image/radar_car_rear_grey.png
diff --git a/insDavi2.0/Res/image/radar_car_rear_red.png b/clusterApp/Res/image/radar_car_rear_red.png
similarity index 100%
rename from insDavi2.0/Res/image/radar_car_rear_red.png
rename to clusterApp/Res/image/radar_car_rear_red.png
diff --git a/insDavi2.0/Res/image/radar_car_rear_white.png b/clusterApp/Res/image/radar_car_rear_white.png
similarity index 100%
rename from insDavi2.0/Res/image/radar_car_rear_white.png
rename to clusterApp/Res/image/radar_car_rear_white.png
diff --git a/insDavi2.0/Res/image/radar_mask_front.png b/clusterApp/Res/image/radar_mask_front.png
similarity index 100%
rename from insDavi2.0/Res/image/radar_mask_front.png
rename to clusterApp/Res/image/radar_mask_front.png
diff --git a/insDavi2.0/Res/image/radar_mask_rear.png b/clusterApp/Res/image/radar_mask_rear.png
similarity index 100%
rename from insDavi2.0/Res/image/radar_mask_rear.png
rename to clusterApp/Res/image/radar_mask_rear.png
diff --git a/insDavi2.0/Res/image/rolling_00.png b/clusterApp/Res/image/rolling_00.png
similarity index 100%
rename from insDavi2.0/Res/image/rolling_00.png
rename to clusterApp/Res/image/rolling_00.png
diff --git a/insDavi2.0/Res/image/rolling_01.png b/clusterApp/Res/image/rolling_01.png
similarity index 100%
rename from insDavi2.0/Res/image/rolling_01.png
rename to clusterApp/Res/image/rolling_01.png
diff --git a/insDavi2.0/Res/image/rolling_02.png b/clusterApp/Res/image/rolling_02.png
similarity index 100%
rename from insDavi2.0/Res/image/rolling_02.png
rename to clusterApp/Res/image/rolling_02.png
diff --git a/insDavi2.0/Res/image/rolling_03.png b/clusterApp/Res/image/rolling_03.png
similarity index 100%
rename from insDavi2.0/Res/image/rolling_03.png
rename to clusterApp/Res/image/rolling_03.png
diff --git a/insDavi2.0/Res/image/rolling_04.png b/clusterApp/Res/image/rolling_04.png
similarity index 100%
rename from insDavi2.0/Res/image/rolling_04.png
rename to clusterApp/Res/image/rolling_04.png
diff --git a/insDavi2.0/Res/image/rolling_05.png b/clusterApp/Res/image/rolling_05.png
similarity index 100%
rename from insDavi2.0/Res/image/rolling_05.png
rename to clusterApp/Res/image/rolling_05.png
diff --git a/insDavi2.0/Res/image/rolling_06.png b/clusterApp/Res/image/rolling_06.png
similarity index 100%
rename from insDavi2.0/Res/image/rolling_06.png
rename to clusterApp/Res/image/rolling_06.png
diff --git a/insDavi2.0/Res/image/rolling_07.png b/clusterApp/Res/image/rolling_07.png
similarity index 100%
rename from insDavi2.0/Res/image/rolling_07.png
rename to clusterApp/Res/image/rolling_07.png
diff --git a/insDavi2.0/Res/image/rolling_08.png b/clusterApp/Res/image/rolling_08.png
similarity index 100%
rename from insDavi2.0/Res/image/rolling_08.png
rename to clusterApp/Res/image/rolling_08.png
diff --git a/insDavi2.0/Res/image/rolling_09.png b/clusterApp/Res/image/rolling_09.png
similarity index 100%
rename from insDavi2.0/Res/image/rolling_09.png
rename to clusterApp/Res/image/rolling_09.png
diff --git a/insDavi2.0/Res/image/rolling_10.png b/clusterApp/Res/image/rolling_10.png
similarity index 100%
rename from insDavi2.0/Res/image/rolling_10.png
rename to clusterApp/Res/image/rolling_10.png
diff --git a/insDavi2.0/Res/image/rolling_11.png b/clusterApp/Res/image/rolling_11.png
similarity index 100%
rename from insDavi2.0/Res/image/rolling_11.png
rename to clusterApp/Res/image/rolling_11.png
diff --git a/insDavi2.0/Res/image/sampling_000.png b/clusterApp/Res/image/sampling_000.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_000.png
rename to clusterApp/Res/image/sampling_000.png
diff --git a/insDavi2.0/Res/image/sampling_001.png b/clusterApp/Res/image/sampling_001.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_001.png
rename to clusterApp/Res/image/sampling_001.png
diff --git a/insDavi2.0/Res/image/sampling_002.png b/clusterApp/Res/image/sampling_002.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_002.png
rename to clusterApp/Res/image/sampling_002.png
diff --git a/insDavi2.0/Res/image/sampling_003.png b/clusterApp/Res/image/sampling_003.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_003.png
rename to clusterApp/Res/image/sampling_003.png
diff --git a/insDavi2.0/Res/image/sampling_004.png b/clusterApp/Res/image/sampling_004.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_004.png
rename to clusterApp/Res/image/sampling_004.png
diff --git a/insDavi2.0/Res/image/sampling_005.png b/clusterApp/Res/image/sampling_005.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_005.png
rename to clusterApp/Res/image/sampling_005.png
diff --git a/insDavi2.0/Res/image/sampling_006.png b/clusterApp/Res/image/sampling_006.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_006.png
rename to clusterApp/Res/image/sampling_006.png
diff --git a/insDavi2.0/Res/image/sampling_007.png b/clusterApp/Res/image/sampling_007.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_007.png
rename to clusterApp/Res/image/sampling_007.png
diff --git a/insDavi2.0/Res/image/sampling_008.png b/clusterApp/Res/image/sampling_008.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_008.png
rename to clusterApp/Res/image/sampling_008.png
diff --git a/insDavi2.0/Res/image/sampling_009.png b/clusterApp/Res/image/sampling_009.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_009.png
rename to clusterApp/Res/image/sampling_009.png
diff --git a/insDavi2.0/Res/image/sampling_010.png b/clusterApp/Res/image/sampling_010.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_010.png
rename to clusterApp/Res/image/sampling_010.png
diff --git a/insDavi2.0/Res/image/sampling_011.png b/clusterApp/Res/image/sampling_011.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_011.png
rename to clusterApp/Res/image/sampling_011.png
diff --git a/insDavi2.0/Res/image/sampling_012.png b/clusterApp/Res/image/sampling_012.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_012.png
rename to clusterApp/Res/image/sampling_012.png
diff --git a/insDavi2.0/Res/image/sampling_013.png b/clusterApp/Res/image/sampling_013.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_013.png
rename to clusterApp/Res/image/sampling_013.png
diff --git a/insDavi2.0/Res/image/sampling_014.png b/clusterApp/Res/image/sampling_014.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_014.png
rename to clusterApp/Res/image/sampling_014.png
diff --git a/insDavi2.0/Res/image/sampling_015.png b/clusterApp/Res/image/sampling_015.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_015.png
rename to clusterApp/Res/image/sampling_015.png
diff --git a/insDavi2.0/Res/image/sampling_016.png b/clusterApp/Res/image/sampling_016.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_016.png
rename to clusterApp/Res/image/sampling_016.png
diff --git a/insDavi2.0/Res/image/sampling_017.png b/clusterApp/Res/image/sampling_017.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_017.png
rename to clusterApp/Res/image/sampling_017.png
diff --git a/insDavi2.0/Res/image/sampling_018.png b/clusterApp/Res/image/sampling_018.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_018.png
rename to clusterApp/Res/image/sampling_018.png
diff --git a/insDavi2.0/Res/image/sampling_019.png b/clusterApp/Res/image/sampling_019.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_019.png
rename to clusterApp/Res/image/sampling_019.png
diff --git a/insDavi2.0/Res/image/sampling_020.png b/clusterApp/Res/image/sampling_020.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_020.png
rename to clusterApp/Res/image/sampling_020.png
diff --git a/insDavi2.0/Res/image/sampling_021.png b/clusterApp/Res/image/sampling_021.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_021.png
rename to clusterApp/Res/image/sampling_021.png
diff --git a/insDavi2.0/Res/image/sampling_022.png b/clusterApp/Res/image/sampling_022.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_022.png
rename to clusterApp/Res/image/sampling_022.png
diff --git a/insDavi2.0/Res/image/sampling_023.png b/clusterApp/Res/image/sampling_023.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_023.png
rename to clusterApp/Res/image/sampling_023.png
diff --git a/insDavi2.0/Res/image/sampling_024.png b/clusterApp/Res/image/sampling_024.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_024.png
rename to clusterApp/Res/image/sampling_024.png
diff --git a/insDavi2.0/Res/image/sampling_025.png b/clusterApp/Res/image/sampling_025.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_025.png
rename to clusterApp/Res/image/sampling_025.png
diff --git a/insDavi2.0/Res/image/sampling_026.png b/clusterApp/Res/image/sampling_026.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_026.png
rename to clusterApp/Res/image/sampling_026.png
diff --git a/insDavi2.0/Res/image/sampling_027.png b/clusterApp/Res/image/sampling_027.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_027.png
rename to clusterApp/Res/image/sampling_027.png
diff --git a/insDavi2.0/Res/image/sampling_028.png b/clusterApp/Res/image/sampling_028.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_028.png
rename to clusterApp/Res/image/sampling_028.png
diff --git a/insDavi2.0/Res/image/sampling_029.png b/clusterApp/Res/image/sampling_029.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_029.png
rename to clusterApp/Res/image/sampling_029.png
diff --git a/insDavi2.0/Res/image/sampling_030.png b/clusterApp/Res/image/sampling_030.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_030.png
rename to clusterApp/Res/image/sampling_030.png
diff --git a/insDavi2.0/Res/image/sampling_031.png b/clusterApp/Res/image/sampling_031.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_031.png
rename to clusterApp/Res/image/sampling_031.png
diff --git a/insDavi2.0/Res/image/sampling_032.png b/clusterApp/Res/image/sampling_032.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_032.png
rename to clusterApp/Res/image/sampling_032.png
diff --git a/insDavi2.0/Res/image/sampling_033.png b/clusterApp/Res/image/sampling_033.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_033.png
rename to clusterApp/Res/image/sampling_033.png
diff --git a/insDavi2.0/Res/image/sampling_034.png b/clusterApp/Res/image/sampling_034.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_034.png
rename to clusterApp/Res/image/sampling_034.png
diff --git a/insDavi2.0/Res/image/sampling_035.png b/clusterApp/Res/image/sampling_035.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_035.png
rename to clusterApp/Res/image/sampling_035.png
diff --git a/insDavi2.0/Res/image/sampling_036.png b/clusterApp/Res/image/sampling_036.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_036.png
rename to clusterApp/Res/image/sampling_036.png
diff --git a/insDavi2.0/Res/image/sampling_037.png b/clusterApp/Res/image/sampling_037.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_037.png
rename to clusterApp/Res/image/sampling_037.png
diff --git a/insDavi2.0/Res/image/sampling_038.png b/clusterApp/Res/image/sampling_038.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_038.png
rename to clusterApp/Res/image/sampling_038.png
diff --git a/insDavi2.0/Res/image/sampling_039.png b/clusterApp/Res/image/sampling_039.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_039.png
rename to clusterApp/Res/image/sampling_039.png
diff --git a/insDavi2.0/Res/image/sampling_040.png b/clusterApp/Res/image/sampling_040.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_040.png
rename to clusterApp/Res/image/sampling_040.png
diff --git a/insDavi2.0/Res/image/sampling_041.png b/clusterApp/Res/image/sampling_041.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_041.png
rename to clusterApp/Res/image/sampling_041.png
diff --git a/insDavi2.0/Res/image/sampling_042.png b/clusterApp/Res/image/sampling_042.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_042.png
rename to clusterApp/Res/image/sampling_042.png
diff --git a/insDavi2.0/Res/image/sampling_043.png b/clusterApp/Res/image/sampling_043.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_043.png
rename to clusterApp/Res/image/sampling_043.png
diff --git a/insDavi2.0/Res/image/sampling_044.png b/clusterApp/Res/image/sampling_044.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_044.png
rename to clusterApp/Res/image/sampling_044.png
diff --git a/insDavi2.0/Res/image/sampling_045.png b/clusterApp/Res/image/sampling_045.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_045.png
rename to clusterApp/Res/image/sampling_045.png
diff --git a/insDavi2.0/Res/image/sampling_046.png b/clusterApp/Res/image/sampling_046.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_046.png
rename to clusterApp/Res/image/sampling_046.png
diff --git a/insDavi2.0/Res/image/sampling_047.png b/clusterApp/Res/image/sampling_047.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_047.png
rename to clusterApp/Res/image/sampling_047.png
diff --git a/insDavi2.0/Res/image/sampling_048.png b/clusterApp/Res/image/sampling_048.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_048.png
rename to clusterApp/Res/image/sampling_048.png
diff --git a/insDavi2.0/Res/image/sampling_049.png b/clusterApp/Res/image/sampling_049.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_049.png
rename to clusterApp/Res/image/sampling_049.png
diff --git a/insDavi2.0/Res/image/sampling_050.png b/clusterApp/Res/image/sampling_050.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_050.png
rename to clusterApp/Res/image/sampling_050.png
diff --git a/insDavi2.0/Res/image/sampling_051.png b/clusterApp/Res/image/sampling_051.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_051.png
rename to clusterApp/Res/image/sampling_051.png
diff --git a/insDavi2.0/Res/image/sampling_052.png b/clusterApp/Res/image/sampling_052.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_052.png
rename to clusterApp/Res/image/sampling_052.png
diff --git a/insDavi2.0/Res/image/sampling_053.png b/clusterApp/Res/image/sampling_053.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_053.png
rename to clusterApp/Res/image/sampling_053.png
diff --git a/insDavi2.0/Res/image/sampling_054.png b/clusterApp/Res/image/sampling_054.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_054.png
rename to clusterApp/Res/image/sampling_054.png
diff --git a/insDavi2.0/Res/image/sampling_055.png b/clusterApp/Res/image/sampling_055.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_055.png
rename to clusterApp/Res/image/sampling_055.png
diff --git a/insDavi2.0/Res/image/sampling_056.png b/clusterApp/Res/image/sampling_056.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_056.png
rename to clusterApp/Res/image/sampling_056.png
diff --git a/insDavi2.0/Res/image/sampling_057.png b/clusterApp/Res/image/sampling_057.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_057.png
rename to clusterApp/Res/image/sampling_057.png
diff --git a/insDavi2.0/Res/image/sampling_058.png b/clusterApp/Res/image/sampling_058.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_058.png
rename to clusterApp/Res/image/sampling_058.png
diff --git a/insDavi2.0/Res/image/sampling_059.png b/clusterApp/Res/image/sampling_059.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_059.png
rename to clusterApp/Res/image/sampling_059.png
diff --git a/insDavi2.0/Res/image/sampling_060.png b/clusterApp/Res/image/sampling_060.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_060.png
rename to clusterApp/Res/image/sampling_060.png
diff --git a/insDavi2.0/Res/image/sampling_061.png b/clusterApp/Res/image/sampling_061.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_061.png
rename to clusterApp/Res/image/sampling_061.png
diff --git a/insDavi2.0/Res/image/sampling_062.png b/clusterApp/Res/image/sampling_062.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_062.png
rename to clusterApp/Res/image/sampling_062.png
diff --git a/insDavi2.0/Res/image/sampling_063.png b/clusterApp/Res/image/sampling_063.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_063.png
rename to clusterApp/Res/image/sampling_063.png
diff --git a/insDavi2.0/Res/image/sampling_064.png b/clusterApp/Res/image/sampling_064.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_064.png
rename to clusterApp/Res/image/sampling_064.png
diff --git a/insDavi2.0/Res/image/sampling_065.png b/clusterApp/Res/image/sampling_065.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_065.png
rename to clusterApp/Res/image/sampling_065.png
diff --git a/insDavi2.0/Res/image/sampling_066.png b/clusterApp/Res/image/sampling_066.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_066.png
rename to clusterApp/Res/image/sampling_066.png
diff --git a/insDavi2.0/Res/image/sampling_067.png b/clusterApp/Res/image/sampling_067.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_067.png
rename to clusterApp/Res/image/sampling_067.png
diff --git a/insDavi2.0/Res/image/sampling_068.png b/clusterApp/Res/image/sampling_068.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_068.png
rename to clusterApp/Res/image/sampling_068.png
diff --git a/insDavi2.0/Res/image/sampling_069.png b/clusterApp/Res/image/sampling_069.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_069.png
rename to clusterApp/Res/image/sampling_069.png
diff --git a/insDavi2.0/Res/image/sampling_070.png b/clusterApp/Res/image/sampling_070.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_070.png
rename to clusterApp/Res/image/sampling_070.png
diff --git a/insDavi2.0/Res/image/sampling_071.png b/clusterApp/Res/image/sampling_071.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_071.png
rename to clusterApp/Res/image/sampling_071.png
diff --git a/insDavi2.0/Res/image/sampling_072.png b/clusterApp/Res/image/sampling_072.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_072.png
rename to clusterApp/Res/image/sampling_072.png
diff --git a/insDavi2.0/Res/image/sampling_073.png b/clusterApp/Res/image/sampling_073.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_073.png
rename to clusterApp/Res/image/sampling_073.png
diff --git a/insDavi2.0/Res/image/sampling_074.png b/clusterApp/Res/image/sampling_074.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_074.png
rename to clusterApp/Res/image/sampling_074.png
diff --git a/insDavi2.0/Res/image/sampling_075.png b/clusterApp/Res/image/sampling_075.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_075.png
rename to clusterApp/Res/image/sampling_075.png
diff --git a/insDavi2.0/Res/image/sampling_076.png b/clusterApp/Res/image/sampling_076.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_076.png
rename to clusterApp/Res/image/sampling_076.png
diff --git a/insDavi2.0/Res/image/sampling_077.png b/clusterApp/Res/image/sampling_077.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_077.png
rename to clusterApp/Res/image/sampling_077.png
diff --git a/insDavi2.0/Res/image/sampling_078.png b/clusterApp/Res/image/sampling_078.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_078.png
rename to clusterApp/Res/image/sampling_078.png
diff --git a/insDavi2.0/Res/image/sampling_079.png b/clusterApp/Res/image/sampling_079.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_079.png
rename to clusterApp/Res/image/sampling_079.png
diff --git a/insDavi2.0/Res/image/sampling_080.png b/clusterApp/Res/image/sampling_080.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_080.png
rename to clusterApp/Res/image/sampling_080.png
diff --git a/insDavi2.0/Res/image/sampling_081.png b/clusterApp/Res/image/sampling_081.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_081.png
rename to clusterApp/Res/image/sampling_081.png
diff --git a/insDavi2.0/Res/image/sampling_082.png b/clusterApp/Res/image/sampling_082.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_082.png
rename to clusterApp/Res/image/sampling_082.png
diff --git a/insDavi2.0/Res/image/sampling_083.png b/clusterApp/Res/image/sampling_083.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_083.png
rename to clusterApp/Res/image/sampling_083.png
diff --git a/insDavi2.0/Res/image/sampling_084.png b/clusterApp/Res/image/sampling_084.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_084.png
rename to clusterApp/Res/image/sampling_084.png
diff --git a/insDavi2.0/Res/image/sampling_085.png b/clusterApp/Res/image/sampling_085.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_085.png
rename to clusterApp/Res/image/sampling_085.png
diff --git a/insDavi2.0/Res/image/sampling_086.png b/clusterApp/Res/image/sampling_086.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_086.png
rename to clusterApp/Res/image/sampling_086.png
diff --git a/insDavi2.0/Res/image/sampling_087.png b/clusterApp/Res/image/sampling_087.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_087.png
rename to clusterApp/Res/image/sampling_087.png
diff --git a/insDavi2.0/Res/image/sampling_088.png b/clusterApp/Res/image/sampling_088.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_088.png
rename to clusterApp/Res/image/sampling_088.png
diff --git a/insDavi2.0/Res/image/sampling_089.png b/clusterApp/Res/image/sampling_089.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_089.png
rename to clusterApp/Res/image/sampling_089.png
diff --git a/insDavi2.0/Res/image/sampling_090.png b/clusterApp/Res/image/sampling_090.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_090.png
rename to clusterApp/Res/image/sampling_090.png
diff --git a/insDavi2.0/Res/image/sampling_091.png b/clusterApp/Res/image/sampling_091.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_091.png
rename to clusterApp/Res/image/sampling_091.png
diff --git a/insDavi2.0/Res/image/sampling_092.png b/clusterApp/Res/image/sampling_092.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_092.png
rename to clusterApp/Res/image/sampling_092.png
diff --git a/insDavi2.0/Res/image/sampling_093.png b/clusterApp/Res/image/sampling_093.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_093.png
rename to clusterApp/Res/image/sampling_093.png
diff --git a/insDavi2.0/Res/image/sampling_094.png b/clusterApp/Res/image/sampling_094.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_094.png
rename to clusterApp/Res/image/sampling_094.png
diff --git a/insDavi2.0/Res/image/sampling_095.png b/clusterApp/Res/image/sampling_095.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_095.png
rename to clusterApp/Res/image/sampling_095.png
diff --git a/insDavi2.0/Res/image/sampling_096.png b/clusterApp/Res/image/sampling_096.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_096.png
rename to clusterApp/Res/image/sampling_096.png
diff --git a/insDavi2.0/Res/image/sampling_097.png b/clusterApp/Res/image/sampling_097.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_097.png
rename to clusterApp/Res/image/sampling_097.png
diff --git a/insDavi2.0/Res/image/sampling_098.png b/clusterApp/Res/image/sampling_098.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_098.png
rename to clusterApp/Res/image/sampling_098.png
diff --git a/insDavi2.0/Res/image/sampling_099.png b/clusterApp/Res/image/sampling_099.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_099.png
rename to clusterApp/Res/image/sampling_099.png
diff --git a/insDavi2.0/Res/image/sampling_100.png b/clusterApp/Res/image/sampling_100.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_100.png
rename to clusterApp/Res/image/sampling_100.png
diff --git a/insDavi2.0/Res/image/sampling_101.png b/clusterApp/Res/image/sampling_101.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_101.png
rename to clusterApp/Res/image/sampling_101.png
diff --git a/insDavi2.0/Res/image/sampling_102.png b/clusterApp/Res/image/sampling_102.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_102.png
rename to clusterApp/Res/image/sampling_102.png
diff --git a/insDavi2.0/Res/image/sampling_103.png b/clusterApp/Res/image/sampling_103.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_103.png
rename to clusterApp/Res/image/sampling_103.png
diff --git a/insDavi2.0/Res/image/sampling_104.png b/clusterApp/Res/image/sampling_104.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_104.png
rename to clusterApp/Res/image/sampling_104.png
diff --git a/insDavi2.0/Res/image/sampling_105.png b/clusterApp/Res/image/sampling_105.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_105.png
rename to clusterApp/Res/image/sampling_105.png
diff --git a/insDavi2.0/Res/image/sampling_106.png b/clusterApp/Res/image/sampling_106.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_106.png
rename to clusterApp/Res/image/sampling_106.png
diff --git a/insDavi2.0/Res/image/sampling_107.png b/clusterApp/Res/image/sampling_107.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_107.png
rename to clusterApp/Res/image/sampling_107.png
diff --git a/insDavi2.0/Res/image/sampling_108.png b/clusterApp/Res/image/sampling_108.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_108.png
rename to clusterApp/Res/image/sampling_108.png
diff --git a/insDavi2.0/Res/image/sampling_109.png b/clusterApp/Res/image/sampling_109.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_109.png
rename to clusterApp/Res/image/sampling_109.png
diff --git a/insDavi2.0/Res/image/sampling_110.png b/clusterApp/Res/image/sampling_110.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_110.png
rename to clusterApp/Res/image/sampling_110.png
diff --git a/insDavi2.0/Res/image/sampling_111.png b/clusterApp/Res/image/sampling_111.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_111.png
rename to clusterApp/Res/image/sampling_111.png
diff --git a/insDavi2.0/Res/image/sampling_112.png b/clusterApp/Res/image/sampling_112.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_112.png
rename to clusterApp/Res/image/sampling_112.png
diff --git a/insDavi2.0/Res/image/sampling_113.png b/clusterApp/Res/image/sampling_113.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_113.png
rename to clusterApp/Res/image/sampling_113.png
diff --git a/insDavi2.0/Res/image/sampling_114.png b/clusterApp/Res/image/sampling_114.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_114.png
rename to clusterApp/Res/image/sampling_114.png
diff --git a/insDavi2.0/Res/image/sampling_115.png b/clusterApp/Res/image/sampling_115.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_115.png
rename to clusterApp/Res/image/sampling_115.png
diff --git a/insDavi2.0/Res/image/sampling_116.png b/clusterApp/Res/image/sampling_116.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_116.png
rename to clusterApp/Res/image/sampling_116.png
diff --git a/insDavi2.0/Res/image/sampling_117.png b/clusterApp/Res/image/sampling_117.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_117.png
rename to clusterApp/Res/image/sampling_117.png
diff --git a/insDavi2.0/Res/image/sampling_118.png b/clusterApp/Res/image/sampling_118.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_118.png
rename to clusterApp/Res/image/sampling_118.png
diff --git a/insDavi2.0/Res/image/sampling_119.png b/clusterApp/Res/image/sampling_119.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_119.png
rename to clusterApp/Res/image/sampling_119.png
diff --git a/insDavi2.0/Res/image/sampling_120.png b/clusterApp/Res/image/sampling_120.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_120.png
rename to clusterApp/Res/image/sampling_120.png
diff --git a/insDavi2.0/Res/image/sampling_121.png b/clusterApp/Res/image/sampling_121.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_121.png
rename to clusterApp/Res/image/sampling_121.png
diff --git a/insDavi2.0/Res/image/sampling_122.png b/clusterApp/Res/image/sampling_122.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_122.png
rename to clusterApp/Res/image/sampling_122.png
diff --git a/insDavi2.0/Res/image/sampling_123.png b/clusterApp/Res/image/sampling_123.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_123.png
rename to clusterApp/Res/image/sampling_123.png
diff --git a/insDavi2.0/Res/image/sampling_124.png b/clusterApp/Res/image/sampling_124.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_124.png
rename to clusterApp/Res/image/sampling_124.png
diff --git a/insDavi2.0/Res/image/sampling_125.png b/clusterApp/Res/image/sampling_125.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_125.png
rename to clusterApp/Res/image/sampling_125.png
diff --git a/insDavi2.0/Res/image/sampling_126.png b/clusterApp/Res/image/sampling_126.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_126.png
rename to clusterApp/Res/image/sampling_126.png
diff --git a/insDavi2.0/Res/image/sampling_127.png b/clusterApp/Res/image/sampling_127.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_127.png
rename to clusterApp/Res/image/sampling_127.png
diff --git a/insDavi2.0/Res/image/sampling_128.png b/clusterApp/Res/image/sampling_128.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_128.png
rename to clusterApp/Res/image/sampling_128.png
diff --git a/insDavi2.0/Res/image/sampling_129.png b/clusterApp/Res/image/sampling_129.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_129.png
rename to clusterApp/Res/image/sampling_129.png
diff --git a/insDavi2.0/Res/image/sampling_130.png b/clusterApp/Res/image/sampling_130.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_130.png
rename to clusterApp/Res/image/sampling_130.png
diff --git a/insDavi2.0/Res/image/sampling_131.png b/clusterApp/Res/image/sampling_131.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_131.png
rename to clusterApp/Res/image/sampling_131.png
diff --git a/insDavi2.0/Res/image/sampling_132.png b/clusterApp/Res/image/sampling_132.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_132.png
rename to clusterApp/Res/image/sampling_132.png
diff --git a/insDavi2.0/Res/image/sampling_133.png b/clusterApp/Res/image/sampling_133.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_133.png
rename to clusterApp/Res/image/sampling_133.png
diff --git a/insDavi2.0/Res/image/sampling_134.png b/clusterApp/Res/image/sampling_134.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_134.png
rename to clusterApp/Res/image/sampling_134.png
diff --git a/insDavi2.0/Res/image/sampling_135.png b/clusterApp/Res/image/sampling_135.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_135.png
rename to clusterApp/Res/image/sampling_135.png
diff --git a/insDavi2.0/Res/image/sampling_136.png b/clusterApp/Res/image/sampling_136.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_136.png
rename to clusterApp/Res/image/sampling_136.png
diff --git a/insDavi2.0/Res/image/sampling_137.png b/clusterApp/Res/image/sampling_137.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_137.png
rename to clusterApp/Res/image/sampling_137.png
diff --git a/insDavi2.0/Res/image/sampling_138.png b/clusterApp/Res/image/sampling_138.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_138.png
rename to clusterApp/Res/image/sampling_138.png
diff --git a/insDavi2.0/Res/image/sampling_139.png b/clusterApp/Res/image/sampling_139.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_139.png
rename to clusterApp/Res/image/sampling_139.png
diff --git a/insDavi2.0/Res/image/sampling_140.png b/clusterApp/Res/image/sampling_140.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_140.png
rename to clusterApp/Res/image/sampling_140.png
diff --git a/insDavi2.0/Res/image/sampling_141.png b/clusterApp/Res/image/sampling_141.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_141.png
rename to clusterApp/Res/image/sampling_141.png
diff --git a/insDavi2.0/Res/image/sampling_142.png b/clusterApp/Res/image/sampling_142.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_142.png
rename to clusterApp/Res/image/sampling_142.png
diff --git a/insDavi2.0/Res/image/sampling_143.png b/clusterApp/Res/image/sampling_143.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_143.png
rename to clusterApp/Res/image/sampling_143.png
diff --git a/insDavi2.0/Res/image/sampling_144.png b/clusterApp/Res/image/sampling_144.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_144.png
rename to clusterApp/Res/image/sampling_144.png
diff --git a/insDavi2.0/Res/image/sampling_145.png b/clusterApp/Res/image/sampling_145.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_145.png
rename to clusterApp/Res/image/sampling_145.png
diff --git a/insDavi2.0/Res/image/sampling_146.png b/clusterApp/Res/image/sampling_146.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_146.png
rename to clusterApp/Res/image/sampling_146.png
diff --git a/insDavi2.0/Res/image/sampling_147.png b/clusterApp/Res/image/sampling_147.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_147.png
rename to clusterApp/Res/image/sampling_147.png
diff --git a/insDavi2.0/Res/image/sampling_148.png b/clusterApp/Res/image/sampling_148.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_148.png
rename to clusterApp/Res/image/sampling_148.png
diff --git a/insDavi2.0/Res/image/sampling_149.png b/clusterApp/Res/image/sampling_149.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_149.png
rename to clusterApp/Res/image/sampling_149.png
diff --git a/insDavi2.0/Res/image/sampling_250.png b/clusterApp/Res/image/sampling_250.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_250.png
rename to clusterApp/Res/image/sampling_250.png
diff --git a/insDavi2.0/Res/image/sampling_251.png b/clusterApp/Res/image/sampling_251.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_251.png
rename to clusterApp/Res/image/sampling_251.png
diff --git a/insDavi2.0/Res/image/sampling_252.png b/clusterApp/Res/image/sampling_252.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_252.png
rename to clusterApp/Res/image/sampling_252.png
diff --git a/insDavi2.0/Res/image/sampling_253.png b/clusterApp/Res/image/sampling_253.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_253.png
rename to clusterApp/Res/image/sampling_253.png
diff --git a/insDavi2.0/Res/image/sampling_254.png b/clusterApp/Res/image/sampling_254.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_254.png
rename to clusterApp/Res/image/sampling_254.png
diff --git a/insDavi2.0/Res/image/sampling_255.png b/clusterApp/Res/image/sampling_255.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_255.png
rename to clusterApp/Res/image/sampling_255.png
diff --git a/insDavi2.0/Res/image/sampling_256.png b/clusterApp/Res/image/sampling_256.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_256.png
rename to clusterApp/Res/image/sampling_256.png
diff --git a/insDavi2.0/Res/image/sampling_257.png b/clusterApp/Res/image/sampling_257.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_257.png
rename to clusterApp/Res/image/sampling_257.png
diff --git a/insDavi2.0/Res/image/sampling_258.png b/clusterApp/Res/image/sampling_258.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_258.png
rename to clusterApp/Res/image/sampling_258.png
diff --git a/insDavi2.0/Res/image/sampling_259.png b/clusterApp/Res/image/sampling_259.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_259.png
rename to clusterApp/Res/image/sampling_259.png
diff --git a/insDavi2.0/Res/image/sampling_260.png b/clusterApp/Res/image/sampling_260.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_260.png
rename to clusterApp/Res/image/sampling_260.png
diff --git a/insDavi2.0/Res/image/sampling_261.png b/clusterApp/Res/image/sampling_261.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_261.png
rename to clusterApp/Res/image/sampling_261.png
diff --git a/insDavi2.0/Res/image/sampling_262.png b/clusterApp/Res/image/sampling_262.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_262.png
rename to clusterApp/Res/image/sampling_262.png
diff --git a/insDavi2.0/Res/image/sampling_263.png b/clusterApp/Res/image/sampling_263.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_263.png
rename to clusterApp/Res/image/sampling_263.png
diff --git a/insDavi2.0/Res/image/sampling_264.png b/clusterApp/Res/image/sampling_264.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_264.png
rename to clusterApp/Res/image/sampling_264.png
diff --git a/insDavi2.0/Res/image/sampling_265.png b/clusterApp/Res/image/sampling_265.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_265.png
rename to clusterApp/Res/image/sampling_265.png
diff --git a/insDavi2.0/Res/image/sampling_266.png b/clusterApp/Res/image/sampling_266.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_266.png
rename to clusterApp/Res/image/sampling_266.png
diff --git a/insDavi2.0/Res/image/sampling_267.png b/clusterApp/Res/image/sampling_267.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_267.png
rename to clusterApp/Res/image/sampling_267.png
diff --git a/insDavi2.0/Res/image/sampling_268.png b/clusterApp/Res/image/sampling_268.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_268.png
rename to clusterApp/Res/image/sampling_268.png
diff --git a/insDavi2.0/Res/image/sampling_269.png b/clusterApp/Res/image/sampling_269.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_269.png
rename to clusterApp/Res/image/sampling_269.png
diff --git a/insDavi2.0/Res/image/sampling_cover.png b/clusterApp/Res/image/sampling_cover.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_cover.png
rename to clusterApp/Res/image/sampling_cover.png
diff --git a/insDavi2.0/Res/image/sampling_error.png b/clusterApp/Res/image/sampling_error.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_error.png
rename to clusterApp/Res/image/sampling_error.png
diff --git a/insDavi2.0/Res/image/sampling_wait.png b/clusterApp/Res/image/sampling_wait.png
similarity index 100%
rename from insDavi2.0/Res/image/sampling_wait.png
rename to clusterApp/Res/image/sampling_wait.png
diff --git a/insDavi2.0/Res/image/sport_000.png b/clusterApp/Res/image/sport_000.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_000.png
rename to clusterApp/Res/image/sport_000.png
diff --git a/insDavi2.0/Res/image/sport_001.png b/clusterApp/Res/image/sport_001.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_001.png
rename to clusterApp/Res/image/sport_001.png
diff --git a/insDavi2.0/Res/image/sport_002.png b/clusterApp/Res/image/sport_002.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_002.png
rename to clusterApp/Res/image/sport_002.png
diff --git a/insDavi2.0/Res/image/sport_003.png b/clusterApp/Res/image/sport_003.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_003.png
rename to clusterApp/Res/image/sport_003.png
diff --git a/insDavi2.0/Res/image/sport_004.png b/clusterApp/Res/image/sport_004.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_004.png
rename to clusterApp/Res/image/sport_004.png
diff --git a/insDavi2.0/Res/image/sport_005.png b/clusterApp/Res/image/sport_005.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_005.png
rename to clusterApp/Res/image/sport_005.png
diff --git a/insDavi2.0/Res/image/sport_006.png b/clusterApp/Res/image/sport_006.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_006.png
rename to clusterApp/Res/image/sport_006.png
diff --git a/insDavi2.0/Res/image/sport_007.png b/clusterApp/Res/image/sport_007.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_007.png
rename to clusterApp/Res/image/sport_007.png
diff --git a/insDavi2.0/Res/image/sport_008.png b/clusterApp/Res/image/sport_008.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_008.png
rename to clusterApp/Res/image/sport_008.png
diff --git a/insDavi2.0/Res/image/sport_009.png b/clusterApp/Res/image/sport_009.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_009.png
rename to clusterApp/Res/image/sport_009.png
diff --git a/insDavi2.0/Res/image/sport_010.png b/clusterApp/Res/image/sport_010.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_010.png
rename to clusterApp/Res/image/sport_010.png
diff --git a/insDavi2.0/Res/image/sport_011.png b/clusterApp/Res/image/sport_011.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_011.png
rename to clusterApp/Res/image/sport_011.png
diff --git a/insDavi2.0/Res/image/sport_012.png b/clusterApp/Res/image/sport_012.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_012.png
rename to clusterApp/Res/image/sport_012.png
diff --git a/insDavi2.0/Res/image/sport_013.png b/clusterApp/Res/image/sport_013.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_013.png
rename to clusterApp/Res/image/sport_013.png
diff --git a/insDavi2.0/Res/image/sport_014.png b/clusterApp/Res/image/sport_014.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_014.png
rename to clusterApp/Res/image/sport_014.png
diff --git a/insDavi2.0/Res/image/sport_015.png b/clusterApp/Res/image/sport_015.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_015.png
rename to clusterApp/Res/image/sport_015.png
diff --git a/insDavi2.0/Res/image/sport_016.png b/clusterApp/Res/image/sport_016.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_016.png
rename to clusterApp/Res/image/sport_016.png
diff --git a/insDavi2.0/Res/image/sport_017.png b/clusterApp/Res/image/sport_017.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_017.png
rename to clusterApp/Res/image/sport_017.png
diff --git a/insDavi2.0/Res/image/sport_018.png b/clusterApp/Res/image/sport_018.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_018.png
rename to clusterApp/Res/image/sport_018.png
diff --git a/insDavi2.0/Res/image/sport_019.png b/clusterApp/Res/image/sport_019.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_019.png
rename to clusterApp/Res/image/sport_019.png
diff --git a/insDavi2.0/Res/image/sport_020.png b/clusterApp/Res/image/sport_020.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_020.png
rename to clusterApp/Res/image/sport_020.png
diff --git a/insDavi2.0/Res/image/sport_021.png b/clusterApp/Res/image/sport_021.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_021.png
rename to clusterApp/Res/image/sport_021.png
diff --git a/insDavi2.0/Res/image/sport_022.png b/clusterApp/Res/image/sport_022.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_022.png
rename to clusterApp/Res/image/sport_022.png
diff --git a/insDavi2.0/Res/image/sport_023.png b/clusterApp/Res/image/sport_023.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_023.png
rename to clusterApp/Res/image/sport_023.png
diff --git a/insDavi2.0/Res/image/sport_024.png b/clusterApp/Res/image/sport_024.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_024.png
rename to clusterApp/Res/image/sport_024.png
diff --git a/insDavi2.0/Res/image/sport_025.png b/clusterApp/Res/image/sport_025.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_025.png
rename to clusterApp/Res/image/sport_025.png
diff --git a/insDavi2.0/Res/image/sport_026.png b/clusterApp/Res/image/sport_026.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_026.png
rename to clusterApp/Res/image/sport_026.png
diff --git a/insDavi2.0/Res/image/sport_027.png b/clusterApp/Res/image/sport_027.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_027.png
rename to clusterApp/Res/image/sport_027.png
diff --git a/insDavi2.0/Res/image/sport_028.png b/clusterApp/Res/image/sport_028.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_028.png
rename to clusterApp/Res/image/sport_028.png
diff --git a/insDavi2.0/Res/image/sport_029.png b/clusterApp/Res/image/sport_029.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_029.png
rename to clusterApp/Res/image/sport_029.png
diff --git a/insDavi2.0/Res/image/sport_030.png b/clusterApp/Res/image/sport_030.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_030.png
rename to clusterApp/Res/image/sport_030.png
diff --git a/insDavi2.0/Res/image/sport_031.png b/clusterApp/Res/image/sport_031.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_031.png
rename to clusterApp/Res/image/sport_031.png
diff --git a/insDavi2.0/Res/image/sport_032.png b/clusterApp/Res/image/sport_032.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_032.png
rename to clusterApp/Res/image/sport_032.png
diff --git a/insDavi2.0/Res/image/sport_033.png b/clusterApp/Res/image/sport_033.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_033.png
rename to clusterApp/Res/image/sport_033.png
diff --git a/insDavi2.0/Res/image/sport_034.png b/clusterApp/Res/image/sport_034.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_034.png
rename to clusterApp/Res/image/sport_034.png
diff --git a/insDavi2.0/Res/image/sport_035.png b/clusterApp/Res/image/sport_035.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_035.png
rename to clusterApp/Res/image/sport_035.png
diff --git a/insDavi2.0/Res/image/sport_036.png b/clusterApp/Res/image/sport_036.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_036.png
rename to clusterApp/Res/image/sport_036.png
diff --git a/insDavi2.0/Res/image/sport_037.png b/clusterApp/Res/image/sport_037.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_037.png
rename to clusterApp/Res/image/sport_037.png
diff --git a/insDavi2.0/Res/image/sport_038.png b/clusterApp/Res/image/sport_038.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_038.png
rename to clusterApp/Res/image/sport_038.png
diff --git a/insDavi2.0/Res/image/sport_039.png b/clusterApp/Res/image/sport_039.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_039.png
rename to clusterApp/Res/image/sport_039.png
diff --git a/insDavi2.0/Res/image/sport_040.png b/clusterApp/Res/image/sport_040.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_040.png
rename to clusterApp/Res/image/sport_040.png
diff --git a/insDavi2.0/Res/image/sport_041.png b/clusterApp/Res/image/sport_041.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_041.png
rename to clusterApp/Res/image/sport_041.png
diff --git a/insDavi2.0/Res/image/sport_042.png b/clusterApp/Res/image/sport_042.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_042.png
rename to clusterApp/Res/image/sport_042.png
diff --git a/insDavi2.0/Res/image/sport_720_030.png b/clusterApp/Res/image/sport_720_030.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_030.png
rename to clusterApp/Res/image/sport_720_030.png
diff --git a/insDavi2.0/Res/image/sport_720_031.png b/clusterApp/Res/image/sport_720_031.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_031.png
rename to clusterApp/Res/image/sport_720_031.png
diff --git a/insDavi2.0/Res/image/sport_720_032.png b/clusterApp/Res/image/sport_720_032.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_032.png
rename to clusterApp/Res/image/sport_720_032.png
diff --git a/insDavi2.0/Res/image/sport_720_033.png b/clusterApp/Res/image/sport_720_033.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_033.png
rename to clusterApp/Res/image/sport_720_033.png
diff --git a/insDavi2.0/Res/image/sport_720_034.png b/clusterApp/Res/image/sport_720_034.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_034.png
rename to clusterApp/Res/image/sport_720_034.png
diff --git a/insDavi2.0/Res/image/sport_720_035.png b/clusterApp/Res/image/sport_720_035.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_035.png
rename to clusterApp/Res/image/sport_720_035.png
diff --git a/insDavi2.0/Res/image/sport_720_036.png b/clusterApp/Res/image/sport_720_036.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_036.png
rename to clusterApp/Res/image/sport_720_036.png
diff --git a/insDavi2.0/Res/image/sport_720_037.png b/clusterApp/Res/image/sport_720_037.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_037.png
rename to clusterApp/Res/image/sport_720_037.png
diff --git a/insDavi2.0/Res/image/sport_720_038.png b/clusterApp/Res/image/sport_720_038.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_038.png
rename to clusterApp/Res/image/sport_720_038.png
diff --git a/insDavi2.0/Res/image/sport_720_039.png b/clusterApp/Res/image/sport_720_039.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_039.png
rename to clusterApp/Res/image/sport_720_039.png
diff --git a/insDavi2.0/Res/image/sport_720_040.png b/clusterApp/Res/image/sport_720_040.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_040.png
rename to clusterApp/Res/image/sport_720_040.png
diff --git a/insDavi2.0/Res/image/sport_720_041.png b/clusterApp/Res/image/sport_720_041.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_041.png
rename to clusterApp/Res/image/sport_720_041.png
diff --git a/insDavi2.0/Res/image/sport_720_042.png b/clusterApp/Res/image/sport_720_042.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_042.png
rename to clusterApp/Res/image/sport_720_042.png
diff --git a/insDavi2.0/Res/image/sport_720_043.png b/clusterApp/Res/image/sport_720_043.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_043.png
rename to clusterApp/Res/image/sport_720_043.png
diff --git a/insDavi2.0/Res/image/sport_720_044.png b/clusterApp/Res/image/sport_720_044.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_044.png
rename to clusterApp/Res/image/sport_720_044.png
diff --git a/insDavi2.0/Res/image/sport_720_045.png b/clusterApp/Res/image/sport_720_045.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_045.png
rename to clusterApp/Res/image/sport_720_045.png
diff --git a/insDavi2.0/Res/image/sport_720_046.png b/clusterApp/Res/image/sport_720_046.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_046.png
rename to clusterApp/Res/image/sport_720_046.png
diff --git a/insDavi2.0/Res/image/sport_720_047.png b/clusterApp/Res/image/sport_720_047.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_047.png
rename to clusterApp/Res/image/sport_720_047.png
diff --git a/insDavi2.0/Res/image/sport_720_048.png b/clusterApp/Res/image/sport_720_048.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_048.png
rename to clusterApp/Res/image/sport_720_048.png
diff --git a/insDavi2.0/Res/image/sport_720_049.png b/clusterApp/Res/image/sport_720_049.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_049.png
rename to clusterApp/Res/image/sport_720_049.png
diff --git a/insDavi2.0/Res/image/sport_720_050.png b/clusterApp/Res/image/sport_720_050.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_050.png
rename to clusterApp/Res/image/sport_720_050.png
diff --git a/insDavi2.0/Res/image/sport_720_051.png b/clusterApp/Res/image/sport_720_051.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_051.png
rename to clusterApp/Res/image/sport_720_051.png
diff --git a/insDavi2.0/Res/image/sport_720_052.png b/clusterApp/Res/image/sport_720_052.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_052.png
rename to clusterApp/Res/image/sport_720_052.png
diff --git a/insDavi2.0/Res/image/sport_720_053.png b/clusterApp/Res/image/sport_720_053.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_053.png
rename to clusterApp/Res/image/sport_720_053.png
diff --git a/insDavi2.0/Res/image/sport_720_054.png b/clusterApp/Res/image/sport_720_054.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_054.png
rename to clusterApp/Res/image/sport_720_054.png
diff --git a/insDavi2.0/Res/image/sport_720_055.png b/clusterApp/Res/image/sport_720_055.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_055.png
rename to clusterApp/Res/image/sport_720_055.png
diff --git a/insDavi2.0/Res/image/sport_720_056.png b/clusterApp/Res/image/sport_720_056.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_056.png
rename to clusterApp/Res/image/sport_720_056.png
diff --git a/insDavi2.0/Res/image/sport_720_057.png b/clusterApp/Res/image/sport_720_057.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_057.png
rename to clusterApp/Res/image/sport_720_057.png
diff --git a/insDavi2.0/Res/image/sport_720_058.png b/clusterApp/Res/image/sport_720_058.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_058.png
rename to clusterApp/Res/image/sport_720_058.png
diff --git a/insDavi2.0/Res/image/sport_720_059.png b/clusterApp/Res/image/sport_720_059.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_059.png
rename to clusterApp/Res/image/sport_720_059.png
diff --git a/insDavi2.0/Res/image/sport_720_060.png b/clusterApp/Res/image/sport_720_060.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_060.png
rename to clusterApp/Res/image/sport_720_060.png
diff --git a/insDavi2.0/Res/image/sport_720_061.png b/clusterApp/Res/image/sport_720_061.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_061.png
rename to clusterApp/Res/image/sport_720_061.png
diff --git a/insDavi2.0/Res/image/sport_720_062.png b/clusterApp/Res/image/sport_720_062.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_062.png
rename to clusterApp/Res/image/sport_720_062.png
diff --git a/insDavi2.0/Res/image/sport_720_063.png b/clusterApp/Res/image/sport_720_063.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_063.png
rename to clusterApp/Res/image/sport_720_063.png
diff --git a/insDavi2.0/Res/image/sport_720_064.png b/clusterApp/Res/image/sport_720_064.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_064.png
rename to clusterApp/Res/image/sport_720_064.png
diff --git a/insDavi2.0/Res/image/sport_720_065.png b/clusterApp/Res/image/sport_720_065.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_065.png
rename to clusterApp/Res/image/sport_720_065.png
diff --git a/insDavi2.0/Res/image/sport_720_066.png b/clusterApp/Res/image/sport_720_066.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_066.png
rename to clusterApp/Res/image/sport_720_066.png
diff --git a/insDavi2.0/Res/image/sport_720_067.png b/clusterApp/Res/image/sport_720_067.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_067.png
rename to clusterApp/Res/image/sport_720_067.png
diff --git a/insDavi2.0/Res/image/sport_720_068.png b/clusterApp/Res/image/sport_720_068.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_068.png
rename to clusterApp/Res/image/sport_720_068.png
diff --git a/insDavi2.0/Res/image/sport_720_069.png b/clusterApp/Res/image/sport_720_069.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_069.png
rename to clusterApp/Res/image/sport_720_069.png
diff --git a/insDavi2.0/Res/image/sport_720_070.png b/clusterApp/Res/image/sport_720_070.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_070.png
rename to clusterApp/Res/image/sport_720_070.png
diff --git a/insDavi2.0/Res/image/sport_720_071.png b/clusterApp/Res/image/sport_720_071.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_071.png
rename to clusterApp/Res/image/sport_720_071.png
diff --git a/insDavi2.0/Res/image/sport_720_072.png b/clusterApp/Res/image/sport_720_072.png
similarity index 100%
rename from insDavi2.0/Res/image/sport_720_072.png
rename to clusterApp/Res/image/sport_720_072.png
diff --git a/insDavi2.0/Res/image/style_led_eco.png b/clusterApp/Res/image/style_led_eco.png
similarity index 100%
rename from insDavi2.0/Res/image/style_led_eco.png
rename to clusterApp/Res/image/style_led_eco.png
diff --git a/insDavi2.0/Res/image/style_led_sport.png b/clusterApp/Res/image/style_led_sport.png
similarity index 100%
rename from insDavi2.0/Res/image/style_led_sport.png
rename to clusterApp/Res/image/style_led_sport.png
diff --git a/insDavi2.0/Res/image/ui3_basic_battery_bg.tga b/clusterApp/Res/image/ui3_basic_battery_bg.tga
similarity index 100%
rename from insDavi2.0/Res/image/ui3_basic_battery_bg.tga
rename to clusterApp/Res/image/ui3_basic_battery_bg.tga
diff --git a/insDavi2.0/Res/image/ui3_basic_battery_full_green.tga b/clusterApp/Res/image/ui3_basic_battery_full_green.tga
similarity index 100%
rename from insDavi2.0/Res/image/ui3_basic_battery_full_green.tga
rename to clusterApp/Res/image/ui3_basic_battery_full_green.tga
diff --git a/insDavi2.0/Res/image/ui3_basic_battery_full_red.tga b/clusterApp/Res/image/ui3_basic_battery_full_red.tga
similarity index 100%
rename from insDavi2.0/Res/image/ui3_basic_battery_full_red.tga
rename to clusterApp/Res/image/ui3_basic_battery_full_red.tga
diff --git a/insDavi2.0/Res/image/ui3_basic_battery_full_yellow.tga b/clusterApp/Res/image/ui3_basic_battery_full_yellow.tga
similarity index 100%
rename from insDavi2.0/Res/image/ui3_basic_battery_full_yellow.tga
rename to clusterApp/Res/image/ui3_basic_battery_full_yellow.tga
diff --git a/insDavi2.0/Res/image/ui3_basic_battery_high_light.tga b/clusterApp/Res/image/ui3_basic_battery_high_light.tga
similarity index 100%
rename from insDavi2.0/Res/image/ui3_basic_battery_high_light.tga
rename to clusterApp/Res/image/ui3_basic_battery_high_light.tga
diff --git a/insDavi2.0/Res/image/ui3_basic_bg_backing.png b/clusterApp/Res/image/ui3_basic_bg_backing.png
similarity index 100%
rename from insDavi2.0/Res/image/ui3_basic_bg_backing.png
rename to clusterApp/Res/image/ui3_basic_bg_backing.png
diff --git a/insDavi2.0/Res/image/ui3_basic_bg_backing_night.png b/clusterApp/Res/image/ui3_basic_bg_backing_night.png
similarity index 100%
rename from insDavi2.0/Res/image/ui3_basic_bg_backing_night.png
rename to clusterApp/Res/image/ui3_basic_bg_backing_night.png
diff --git a/insDavi2.0/Res/image/ui3_basic_bg_bottom.png b/clusterApp/Res/image/ui3_basic_bg_bottom.png
similarity index 100%
rename from insDavi2.0/Res/image/ui3_basic_bg_bottom.png
rename to clusterApp/Res/image/ui3_basic_bg_bottom.png
diff --git a/insDavi2.0/Res/image/ui3_basic_bg_bottom.tga b/clusterApp/Res/image/ui3_basic_bg_bottom.tga
similarity index 100%
rename from insDavi2.0/Res/image/ui3_basic_bg_bottom.tga
rename to clusterApp/Res/image/ui3_basic_bg_bottom.tga
diff --git a/insDavi2.0/Res/image/ui3_basic_bg_bottom_night.png b/clusterApp/Res/image/ui3_basic_bg_bottom_night.png
similarity index 100%
rename from insDavi2.0/Res/image/ui3_basic_bg_bottom_night.png
rename to clusterApp/Res/image/ui3_basic_bg_bottom_night.png
diff --git a/insDavi2.0/Res/image/ui3_basic_bg_bottom_night.tga b/clusterApp/Res/image/ui3_basic_bg_bottom_night.tga
similarity index 100%
rename from insDavi2.0/Res/image/ui3_basic_bg_bottom_night.tga
rename to clusterApp/Res/image/ui3_basic_bg_bottom_night.tga
diff --git a/insDavi2.0/Res/image/ui3_basic_bg_driving.png b/clusterApp/Res/image/ui3_basic_bg_driving.png
similarity index 100%
rename from insDavi2.0/Res/image/ui3_basic_bg_driving.png
rename to clusterApp/Res/image/ui3_basic_bg_driving.png
diff --git a/insDavi2.0/Res/image/ui3_basic_bg_driving_night.png b/clusterApp/Res/image/ui3_basic_bg_driving_night.png
similarity index 100%
rename from insDavi2.0/Res/image/ui3_basic_bg_driving_night.png
rename to clusterApp/Res/image/ui3_basic_bg_driving_night.png
diff --git a/insDavi2.0/Res/image/ui3_basic_bg_parking.png b/clusterApp/Res/image/ui3_basic_bg_parking.png
similarity index 100%
rename from insDavi2.0/Res/image/ui3_basic_bg_parking.png
rename to clusterApp/Res/image/ui3_basic_bg_parking.png
diff --git a/insDavi2.0/Res/image/ui3_basic_bg_parking_night.png b/clusterApp/Res/image/ui3_basic_bg_parking_night.png
similarity index 100%
rename from insDavi2.0/Res/image/ui3_basic_bg_parking_night.png
rename to clusterApp/Res/image/ui3_basic_bg_parking_night.png
diff --git a/insDavi2.0/Res/image/ui3_basic_mute_icon.tga b/clusterApp/Res/image/ui3_basic_mute_icon.tga
similarity index 100%
rename from insDavi2.0/Res/image/ui3_basic_mute_icon.tga
rename to clusterApp/Res/image/ui3_basic_mute_icon.tga
diff --git a/insDavi2.0/Res/image/ui3_basic_temperature_icon.tga b/clusterApp/Res/image/ui3_basic_temperature_icon.tga
similarity index 100%
rename from insDavi2.0/Res/image/ui3_basic_temperature_icon.tga
rename to clusterApp/Res/image/ui3_basic_temperature_icon.tga
diff --git a/insDavi2.0/Res/image/ui3_gear_D_gray.tga b/clusterApp/Res/image/ui3_gear_D_gray.tga
similarity index 100%
rename from insDavi2.0/Res/image/ui3_gear_D_gray.tga
rename to clusterApp/Res/image/ui3_gear_D_gray.tga
diff --git a/insDavi2.0/Res/image/ui3_gear_N_gray.tga b/clusterApp/Res/image/ui3_gear_N_gray.tga
similarity index 100%
rename from insDavi2.0/Res/image/ui3_gear_N_gray.tga
rename to clusterApp/Res/image/ui3_gear_N_gray.tga
diff --git a/insDavi2.0/Res/image/ui3_gear_PRND_gray.tga b/clusterApp/Res/image/ui3_gear_PRND_gray.tga
similarity index 100%
rename from insDavi2.0/Res/image/ui3_gear_PRND_gray.tga
rename to clusterApp/Res/image/ui3_gear_PRND_gray.tga
diff --git a/insDavi2.0/Res/image/ui3_gear_P_gray.tga b/clusterApp/Res/image/ui3_gear_P_gray.tga
similarity index 100%
rename from insDavi2.0/Res/image/ui3_gear_P_gray.tga
rename to clusterApp/Res/image/ui3_gear_P_gray.tga
diff --git a/insDavi2.0/Res/image/ui3_gear_R_gray.tga b/clusterApp/Res/image/ui3_gear_R_gray.tga
similarity index 100%
rename from insDavi2.0/Res/image/ui3_gear_R_gray.tga
rename to clusterApp/Res/image/ui3_gear_R_gray.tga
diff --git a/insDavi2.0/Res/image/ui3_led_ready.tga b/clusterApp/Res/image/ui3_led_ready.tga
similarity index 100%
rename from insDavi2.0/Res/image/ui3_led_ready.tga
rename to clusterApp/Res/image/ui3_led_ready.tga
diff --git a/insDavi2.0/Res/image/ui3_speed_digit_0.png b/clusterApp/Res/image/ui3_speed_digit_0.png
similarity index 100%
rename from insDavi2.0/Res/image/ui3_speed_digit_0.png
rename to clusterApp/Res/image/ui3_speed_digit_0.png
diff --git a/insDavi2.0/Res/image/ui3_speed_digit_1.png b/clusterApp/Res/image/ui3_speed_digit_1.png
similarity index 100%
rename from insDavi2.0/Res/image/ui3_speed_digit_1.png
rename to clusterApp/Res/image/ui3_speed_digit_1.png
diff --git a/insDavi2.0/Res/image/ui3_speed_digit_2.png b/clusterApp/Res/image/ui3_speed_digit_2.png
similarity index 100%
rename from insDavi2.0/Res/image/ui3_speed_digit_2.png
rename to clusterApp/Res/image/ui3_speed_digit_2.png
diff --git a/insDavi2.0/Res/image/ui3_speed_digit_3.png b/clusterApp/Res/image/ui3_speed_digit_3.png
similarity index 100%
rename from insDavi2.0/Res/image/ui3_speed_digit_3.png
rename to clusterApp/Res/image/ui3_speed_digit_3.png
diff --git a/insDavi2.0/Res/image/ui3_speed_digit_4.png b/clusterApp/Res/image/ui3_speed_digit_4.png
similarity index 100%
rename from insDavi2.0/Res/image/ui3_speed_digit_4.png
rename to clusterApp/Res/image/ui3_speed_digit_4.png
diff --git a/insDavi2.0/Res/image/ui3_speed_digit_5.png b/clusterApp/Res/image/ui3_speed_digit_5.png
similarity index 100%
rename from insDavi2.0/Res/image/ui3_speed_digit_5.png
rename to clusterApp/Res/image/ui3_speed_digit_5.png
diff --git a/insDavi2.0/Res/image/ui3_speed_digit_6.png b/clusterApp/Res/image/ui3_speed_digit_6.png
similarity index 100%
rename from insDavi2.0/Res/image/ui3_speed_digit_6.png
rename to clusterApp/Res/image/ui3_speed_digit_6.png
diff --git a/insDavi2.0/Res/image/ui3_speed_digit_7.png b/clusterApp/Res/image/ui3_speed_digit_7.png
similarity index 100%
rename from insDavi2.0/Res/image/ui3_speed_digit_7.png
rename to clusterApp/Res/image/ui3_speed_digit_7.png
diff --git a/insDavi2.0/Res/image/ui3_speed_digit_8.png b/clusterApp/Res/image/ui3_speed_digit_8.png
similarity index 100%
rename from insDavi2.0/Res/image/ui3_speed_digit_8.png
rename to clusterApp/Res/image/ui3_speed_digit_8.png
diff --git a/insDavi2.0/Res/image/ui3_speed_digit_9.png b/clusterApp/Res/image/ui3_speed_digit_9.png
similarity index 100%
rename from insDavi2.0/Res/image/ui3_speed_digit_9.png
rename to clusterApp/Res/image/ui3_speed_digit_9.png
diff --git a/insDavi2.0/Res/image/ui3_speed_digit_degree.png b/clusterApp/Res/image/ui3_speed_digit_degree.png
similarity index 100%
rename from insDavi2.0/Res/image/ui3_speed_digit_degree.png
rename to clusterApp/Res/image/ui3_speed_digit_degree.png
diff --git a/insDavi2.0/Res/image/ui3_speed_digit_dot.png b/clusterApp/Res/image/ui3_speed_digit_dot.png
similarity index 100%
rename from insDavi2.0/Res/image/ui3_speed_digit_dot.png
rename to clusterApp/Res/image/ui3_speed_digit_dot.png
diff --git a/insDavi2.0/Res/image/ui3_speed_digit_negative.png b/clusterApp/Res/image/ui3_speed_digit_negative.png
similarity index 100%
rename from insDavi2.0/Res/image/ui3_speed_digit_negative.png
rename to clusterApp/Res/image/ui3_speed_digit_negative.png
diff --git a/insDavi2.0/Res/image/ui3_speed_digit_red_0.png b/clusterApp/Res/image/ui3_speed_digit_red_0.png
similarity index 100%
rename from insDavi2.0/Res/image/ui3_speed_digit_red_0.png
rename to clusterApp/Res/image/ui3_speed_digit_red_0.png
diff --git a/insDavi2.0/Res/image/ui3_speed_digit_red_1.png b/clusterApp/Res/image/ui3_speed_digit_red_1.png
similarity index 100%
rename from insDavi2.0/Res/image/ui3_speed_digit_red_1.png
rename to clusterApp/Res/image/ui3_speed_digit_red_1.png
diff --git a/insDavi2.0/Res/image/ui3_speed_digit_red_2.png b/clusterApp/Res/image/ui3_speed_digit_red_2.png
similarity index 100%
rename from insDavi2.0/Res/image/ui3_speed_digit_red_2.png
rename to clusterApp/Res/image/ui3_speed_digit_red_2.png
diff --git a/insDavi2.0/Res/image/ui3_speed_digit_red_3.png b/clusterApp/Res/image/ui3_speed_digit_red_3.png
similarity index 100%
rename from insDavi2.0/Res/image/ui3_speed_digit_red_3.png
rename to clusterApp/Res/image/ui3_speed_digit_red_3.png
diff --git a/insDavi2.0/Res/image/ui3_speed_digit_red_4.png b/clusterApp/Res/image/ui3_speed_digit_red_4.png
similarity index 100%
rename from insDavi2.0/Res/image/ui3_speed_digit_red_4.png
rename to clusterApp/Res/image/ui3_speed_digit_red_4.png
diff --git a/insDavi2.0/Res/image/ui3_speed_digit_red_5.png b/clusterApp/Res/image/ui3_speed_digit_red_5.png
similarity index 100%
rename from insDavi2.0/Res/image/ui3_speed_digit_red_5.png
rename to clusterApp/Res/image/ui3_speed_digit_red_5.png
diff --git a/insDavi2.0/Res/image/ui3_speed_digit_red_6.png b/clusterApp/Res/image/ui3_speed_digit_red_6.png
similarity index 100%
rename from insDavi2.0/Res/image/ui3_speed_digit_red_6.png
rename to clusterApp/Res/image/ui3_speed_digit_red_6.png
diff --git a/insDavi2.0/Res/image/ui3_speed_digit_red_7.png b/clusterApp/Res/image/ui3_speed_digit_red_7.png
similarity index 100%
rename from insDavi2.0/Res/image/ui3_speed_digit_red_7.png
rename to clusterApp/Res/image/ui3_speed_digit_red_7.png
diff --git a/insDavi2.0/Res/image/ui3_speed_digit_red_8.png b/clusterApp/Res/image/ui3_speed_digit_red_8.png
similarity index 100%
rename from insDavi2.0/Res/image/ui3_speed_digit_red_8.png
rename to clusterApp/Res/image/ui3_speed_digit_red_8.png
diff --git a/insDavi2.0/Res/image/ui3_speed_digit_red_9.png b/clusterApp/Res/image/ui3_speed_digit_red_9.png
similarity index 100%
rename from insDavi2.0/Res/image/ui3_speed_digit_red_9.png
rename to clusterApp/Res/image/ui3_speed_digit_red_9.png
diff --git a/insDavi2.0/Res/image/ui3_speed_digit_red_dot.png b/clusterApp/Res/image/ui3_speed_digit_red_dot.png
similarity index 100%
rename from insDavi2.0/Res/image/ui3_speed_digit_red_dot.png
rename to clusterApp/Res/image/ui3_speed_digit_red_dot.png
diff --git a/insDavi2.0/Res/image/ui3_speed_invalid.png b/clusterApp/Res/image/ui3_speed_invalid.png
similarity index 100%
rename from insDavi2.0/Res/image/ui3_speed_invalid.png
rename to clusterApp/Res/image/ui3_speed_invalid.png
diff --git a/insDavi2.0/Res/image/ui3_speed_unit_kmph.png b/clusterApp/Res/image/ui3_speed_unit_kmph.png
similarity index 100%
rename from insDavi2.0/Res/image/ui3_speed_unit_kmph.png
rename to clusterApp/Res/image/ui3_speed_unit_kmph.png
diff --git a/insDavi2.0/Res/image/upgrade_icon_waiting.png b/clusterApp/Res/image/upgrade_icon_waiting.png
similarity index 100%
rename from insDavi2.0/Res/image/upgrade_icon_waiting.png
rename to clusterApp/Res/image/upgrade_icon_waiting.png
diff --git a/insDavi2.0/Res/image/upgrade_logo.png b/clusterApp/Res/image/upgrade_logo.png
similarity index 100%
rename from insDavi2.0/Res/image/upgrade_logo.png
rename to clusterApp/Res/image/upgrade_logo.png
diff --git a/insDavi2.0/Res/image/upgrade_tips_waiting.png b/clusterApp/Res/image/upgrade_tips_waiting.png
similarity index 100%
rename from insDavi2.0/Res/image/upgrade_tips_waiting.png
rename to clusterApp/Res/image/upgrade_tips_waiting.png
diff --git a/insDavi2.0/Res/image/vai_shadow.png b/clusterApp/Res/image/vai_shadow.png
similarity index 100%
rename from insDavi2.0/Res/image/vai_shadow.png
rename to clusterApp/Res/image/vai_shadow.png
diff --git a/insDavi2.0/Res/image/weather_icon_01.png b/clusterApp/Res/image/weather_icon_01.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_01.png
rename to clusterApp/Res/image/weather_icon_01.png
diff --git a/insDavi2.0/Res/image/weather_icon_02.png b/clusterApp/Res/image/weather_icon_02.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_02.png
rename to clusterApp/Res/image/weather_icon_02.png
diff --git a/insDavi2.0/Res/image/weather_icon_03.png b/clusterApp/Res/image/weather_icon_03.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_03.png
rename to clusterApp/Res/image/weather_icon_03.png
diff --git a/insDavi2.0/Res/image/weather_icon_04.png b/clusterApp/Res/image/weather_icon_04.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_04.png
rename to clusterApp/Res/image/weather_icon_04.png
diff --git a/insDavi2.0/Res/image/weather_icon_05.png b/clusterApp/Res/image/weather_icon_05.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_05.png
rename to clusterApp/Res/image/weather_icon_05.png
diff --git a/insDavi2.0/Res/image/weather_icon_06.png b/clusterApp/Res/image/weather_icon_06.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_06.png
rename to clusterApp/Res/image/weather_icon_06.png
diff --git a/insDavi2.0/Res/image/weather_icon_07.png b/clusterApp/Res/image/weather_icon_07.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_07.png
rename to clusterApp/Res/image/weather_icon_07.png
diff --git a/insDavi2.0/Res/image/weather_icon_08.png b/clusterApp/Res/image/weather_icon_08.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_08.png
rename to clusterApp/Res/image/weather_icon_08.png
diff --git a/insDavi2.0/Res/image/weather_icon_09.png b/clusterApp/Res/image/weather_icon_09.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_09.png
rename to clusterApp/Res/image/weather_icon_09.png
diff --git a/insDavi2.0/Res/image/weather_icon_10.png b/clusterApp/Res/image/weather_icon_10.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_10.png
rename to clusterApp/Res/image/weather_icon_10.png
diff --git a/insDavi2.0/Res/image/weather_icon_11.png b/clusterApp/Res/image/weather_icon_11.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_11.png
rename to clusterApp/Res/image/weather_icon_11.png
diff --git a/insDavi2.0/Res/image/weather_icon_12.png b/clusterApp/Res/image/weather_icon_12.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_12.png
rename to clusterApp/Res/image/weather_icon_12.png
diff --git a/insDavi2.0/Res/image/weather_icon_13.png b/clusterApp/Res/image/weather_icon_13.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_13.png
rename to clusterApp/Res/image/weather_icon_13.png
diff --git a/insDavi2.0/Res/image/weather_icon_14.png b/clusterApp/Res/image/weather_icon_14.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_14.png
rename to clusterApp/Res/image/weather_icon_14.png
diff --git a/insDavi2.0/Res/image/weather_icon_15.png b/clusterApp/Res/image/weather_icon_15.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_15.png
rename to clusterApp/Res/image/weather_icon_15.png
diff --git a/insDavi2.0/Res/image/weather_icon_16.png b/clusterApp/Res/image/weather_icon_16.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_16.png
rename to clusterApp/Res/image/weather_icon_16.png
diff --git a/insDavi2.0/Res/image/weather_icon_17.png b/clusterApp/Res/image/weather_icon_17.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_17.png
rename to clusterApp/Res/image/weather_icon_17.png
diff --git a/insDavi2.0/Res/image/weather_icon_18.png b/clusterApp/Res/image/weather_icon_18.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_18.png
rename to clusterApp/Res/image/weather_icon_18.png
diff --git a/insDavi2.0/Res/image/weather_icon_19.png b/clusterApp/Res/image/weather_icon_19.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_19.png
rename to clusterApp/Res/image/weather_icon_19.png
diff --git a/insDavi2.0/Res/image/weather_icon_20.png b/clusterApp/Res/image/weather_icon_20.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_20.png
rename to clusterApp/Res/image/weather_icon_20.png
diff --git a/insDavi2.0/Res/image/weather_icon_21.png b/clusterApp/Res/image/weather_icon_21.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_21.png
rename to clusterApp/Res/image/weather_icon_21.png
diff --git a/insDavi2.0/Res/image/weather_icon_22.png b/clusterApp/Res/image/weather_icon_22.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_22.png
rename to clusterApp/Res/image/weather_icon_22.png
diff --git a/insDavi2.0/Res/image/weather_icon_23.png b/clusterApp/Res/image/weather_icon_23.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_23.png
rename to clusterApp/Res/image/weather_icon_23.png
diff --git a/insDavi2.0/Res/image/weather_icon_24.png b/clusterApp/Res/image/weather_icon_24.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_24.png
rename to clusterApp/Res/image/weather_icon_24.png
diff --git a/insDavi2.0/Res/image/weather_icon_25.png b/clusterApp/Res/image/weather_icon_25.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_25.png
rename to clusterApp/Res/image/weather_icon_25.png
diff --git a/insDavi2.0/Res/image/weather_icon_26.png b/clusterApp/Res/image/weather_icon_26.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_26.png
rename to clusterApp/Res/image/weather_icon_26.png
diff --git a/insDavi2.0/Res/image/weather_icon_27.png b/clusterApp/Res/image/weather_icon_27.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_27.png
rename to clusterApp/Res/image/weather_icon_27.png
diff --git a/insDavi2.0/Res/image/weather_icon_28.png b/clusterApp/Res/image/weather_icon_28.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_28.png
rename to clusterApp/Res/image/weather_icon_28.png
diff --git a/insDavi2.0/Res/image/weather_icon_29.png b/clusterApp/Res/image/weather_icon_29.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_29.png
rename to clusterApp/Res/image/weather_icon_29.png
diff --git a/insDavi2.0/Res/image/weather_icon_30.png b/clusterApp/Res/image/weather_icon_30.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_30.png
rename to clusterApp/Res/image/weather_icon_30.png
diff --git a/insDavi2.0/Res/image/weather_icon_31.png b/clusterApp/Res/image/weather_icon_31.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_31.png
rename to clusterApp/Res/image/weather_icon_31.png
diff --git a/insDavi2.0/Res/image/weather_icon_32.png b/clusterApp/Res/image/weather_icon_32.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_32.png
rename to clusterApp/Res/image/weather_icon_32.png
diff --git a/insDavi2.0/Res/image/weather_icon_33.png b/clusterApp/Res/image/weather_icon_33.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_33.png
rename to clusterApp/Res/image/weather_icon_33.png
diff --git a/insDavi2.0/Res/image/weather_icon_34.png b/clusterApp/Res/image/weather_icon_34.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_34.png
rename to clusterApp/Res/image/weather_icon_34.png
diff --git a/insDavi2.0/Res/image/weather_icon_35.png b/clusterApp/Res/image/weather_icon_35.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_35.png
rename to clusterApp/Res/image/weather_icon_35.png
diff --git a/insDavi2.0/Res/image/weather_icon_36.png b/clusterApp/Res/image/weather_icon_36.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_36.png
rename to clusterApp/Res/image/weather_icon_36.png
diff --git a/insDavi2.0/Res/image/weather_icon_37.png b/clusterApp/Res/image/weather_icon_37.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_icon_37.png
rename to clusterApp/Res/image/weather_icon_37.png
diff --git a/insDavi2.0/Res/image/weather_shadow.png b/clusterApp/Res/image/weather_shadow.png
similarity index 100%
rename from insDavi2.0/Res/image/weather_shadow.png
rename to clusterApp/Res/image/weather_shadow.png
diff --git a/insDavi2.0/Res/model3d/Bicycle_Simple_Model_blue.png b/clusterApp/Res/model3d/Bicycle_Simple_Model_blue.png
similarity index 100%
rename from insDavi2.0/Res/model3d/Bicycle_Simple_Model_blue.png
rename to clusterApp/Res/model3d/Bicycle_Simple_Model_blue.png
diff --git a/insDavi2.0/Res/model3d/Bicycle_Simple_Model_gray.png b/clusterApp/Res/model3d/Bicycle_Simple_Model_gray.png
similarity index 100%
rename from insDavi2.0/Res/model3d/Bicycle_Simple_Model_gray.png
rename to clusterApp/Res/model3d/Bicycle_Simple_Model_gray.png
diff --git a/insDavi2.0/Res/model3d/Bicycle_Simple_Model_red.png b/clusterApp/Res/model3d/Bicycle_Simple_Model_red.png
similarity index 100%
rename from insDavi2.0/Res/model3d/Bicycle_Simple_Model_red.png
rename to clusterApp/Res/model3d/Bicycle_Simple_Model_red.png
diff --git a/insDavi2.0/Res/model3d/Bicycle_Simple_Model_yellow.png b/clusterApp/Res/model3d/Bicycle_Simple_Model_yellow.png
similarity index 100%
rename from insDavi2.0/Res/model3d/Bicycle_Simple_Model_yellow.png
rename to clusterApp/Res/model3d/Bicycle_Simple_Model_yellow.png
diff --git a/insDavi2.0/Res/model3d/Car_Simple_Model_blue.png b/clusterApp/Res/model3d/Car_Simple_Model_blue.png
similarity index 100%
rename from insDavi2.0/Res/model3d/Car_Simple_Model_blue.png
rename to clusterApp/Res/model3d/Car_Simple_Model_blue.png
diff --git a/insDavi2.0/Res/model3d/Car_Simple_Model_gray.png b/clusterApp/Res/model3d/Car_Simple_Model_gray.png
similarity index 100%
rename from insDavi2.0/Res/model3d/Car_Simple_Model_gray.png
rename to clusterApp/Res/model3d/Car_Simple_Model_gray.png
diff --git a/insDavi2.0/Res/model3d/Car_Simple_Model_red.png b/clusterApp/Res/model3d/Car_Simple_Model_red.png
similarity index 100%
rename from insDavi2.0/Res/model3d/Car_Simple_Model_red.png
rename to clusterApp/Res/model3d/Car_Simple_Model_red.png
diff --git a/insDavi2.0/Res/model3d/Car_Simple_Model_yellow.png b/clusterApp/Res/model3d/Car_Simple_Model_yellow.png
similarity index 100%
rename from insDavi2.0/Res/model3d/Car_Simple_Model_yellow.png
rename to clusterApp/Res/model3d/Car_Simple_Model_yellow.png
diff --git a/insDavi2.0/Res/model3d/Truck_Simple_Model_blue.png b/clusterApp/Res/model3d/Truck_Simple_Model_blue.png
similarity index 100%
rename from insDavi2.0/Res/model3d/Truck_Simple_Model_blue.png
rename to clusterApp/Res/model3d/Truck_Simple_Model_blue.png
diff --git a/insDavi2.0/Res/model3d/Truck_Simple_Model_gray.png b/clusterApp/Res/model3d/Truck_Simple_Model_gray.png
similarity index 100%
rename from insDavi2.0/Res/model3d/Truck_Simple_Model_gray.png
rename to clusterApp/Res/model3d/Truck_Simple_Model_gray.png
diff --git a/insDavi2.0/Res/model3d/Truck_Simple_Model_red.png b/clusterApp/Res/model3d/Truck_Simple_Model_red.png
similarity index 100%
rename from insDavi2.0/Res/model3d/Truck_Simple_Model_red.png
rename to clusterApp/Res/model3d/Truck_Simple_Model_red.png
diff --git a/insDavi2.0/Res/model3d/Truck_Simple_Model_yellow.png b/clusterApp/Res/model3d/Truck_Simple_Model_yellow.png
similarity index 100%
rename from insDavi2.0/Res/model3d/Truck_Simple_Model_yellow.png
rename to clusterApp/Res/model3d/Truck_Simple_Model_yellow.png
diff --git a/insDavi2.0/Res/shader/prog_color.fp b/clusterApp/Res/shader/prog_color.fp
similarity index 84%
rename from insDavi2.0/Res/shader/prog_color.fp
rename to clusterApp/Res/shader/prog_color.fp
index e22036f..f66bb97 100644
--- a/insDavi2.0/Res/shader/prog_color.fp
+++ b/clusterApp/Res/shader/prog_color.fp
@@ -1,3 +1,4 @@
+precision mediump float;
 uniform float u_flt_inv_alpha;
 varying vec4 v_v4_clr;
 void main()
diff --git a/insDavi2.0/Res/shader/prog_color.vp b/clusterApp/Res/shader/prog_color.vp
similarity index 100%
rename from insDavi2.0/Res/shader/prog_color.vp
rename to clusterApp/Res/shader/prog_color.vp
diff --git a/insDavi2.0/Res/shader/prog_color_with_tex_alpha.fp b/clusterApp/Res/shader/prog_color_with_tex_alpha.fp
similarity index 89%
rename from insDavi2.0/Res/shader/prog_color_with_tex_alpha.fp
rename to clusterApp/Res/shader/prog_color_with_tex_alpha.fp
index c3d20b5..1a866df 100644
--- a/insDavi2.0/Res/shader/prog_color_with_tex_alpha.fp
+++ b/clusterApp/Res/shader/prog_color_with_tex_alpha.fp
@@ -1,3 +1,5 @@
+precision mediump float;
+
 uniform sampler2D u_sam_tex;
 uniform float u_flt_inv_alpha;
 varying vec4 v_v4_clr;
diff --git a/insDavi2.0/Res/shader/prog_color_with_tex_alpha.vp b/clusterApp/Res/shader/prog_color_with_tex_alpha.vp
similarity index 100%
rename from insDavi2.0/Res/shader/prog_color_with_tex_alpha.vp
rename to clusterApp/Res/shader/prog_color_with_tex_alpha.vp
diff --git a/insDavi2.0/Res/shader/prog_font.fp b/clusterApp/Res/shader/prog_font.fp
similarity index 91%
rename from insDavi2.0/Res/shader/prog_font.fp
rename to clusterApp/Res/shader/prog_font.fp
index b058d83..d69e88e 100644
--- a/insDavi2.0/Res/shader/prog_font.fp
+++ b/clusterApp/Res/shader/prog_font.fp
@@ -1,3 +1,5 @@
+precision mediump float;
+
 uniform sampler2D u_sam_tex;
 uniform vec3 u_v3_clr;
 uniform float u_flt_inv_alpha;
diff --git a/insDavi2.0/Res/shader/prog_font.vp b/clusterApp/Res/shader/prog_font.vp
similarity index 100%
rename from insDavi2.0/Res/shader/prog_font.vp
rename to clusterApp/Res/shader/prog_font.vp
diff --git a/insDavi2.0/Res/shader/prog_font_attr_alpha.fp b/clusterApp/Res/shader/prog_font_attr_alpha.fp
similarity index 91%
rename from insDavi2.0/Res/shader/prog_font_attr_alpha.fp
rename to clusterApp/Res/shader/prog_font_attr_alpha.fp
index ec2826f..6c5e62d 100644
--- a/insDavi2.0/Res/shader/prog_font_attr_alpha.fp
+++ b/clusterApp/Res/shader/prog_font_attr_alpha.fp
@@ -1,3 +1,5 @@
+precision mediump float;
+
 uniform sampler2D u_sam_tex;
 uniform vec3 u_v3_clr;
 uniform float u_flt_inv_alpha;
diff --git a/insDavi2.0/Res/shader/prog_font_attr_alpha.vp b/clusterApp/Res/shader/prog_font_attr_alpha.vp
similarity index 100%
rename from insDavi2.0/Res/shader/prog_font_attr_alpha.vp
rename to clusterApp/Res/shader/prog_font_attr_alpha.vp
diff --git a/insDavi2.0/Res/shader/prog_model_ads.fp b/clusterApp/Res/shader/prog_model_ads.fp
similarity index 96%
rename from insDavi2.0/Res/shader/prog_model_ads.fp
rename to clusterApp/Res/shader/prog_model_ads.fp
index c036ae1..2ff71fc 100644
--- a/insDavi2.0/Res/shader/prog_model_ads.fp
+++ b/clusterApp/Res/shader/prog_model_ads.fp
@@ -1,3 +1,5 @@
+precision mediump float;
+
 
 uniform mat4 u_mat4_ads;
 
diff --git a/insDavi2.0/Res/shader/prog_model_ads.vp b/clusterApp/Res/shader/prog_model_ads.vp
similarity index 100%
rename from insDavi2.0/Res/shader/prog_model_ads.vp
rename to clusterApp/Res/shader/prog_model_ads.vp
diff --git a/insDavi2.0/Res/shader/prog_texture.fp b/clusterApp/Res/shader/prog_texture.fp
similarity index 87%
rename from insDavi2.0/Res/shader/prog_texture.fp
rename to clusterApp/Res/shader/prog_texture.fp
index a33a1b7..0554319 100644
--- a/insDavi2.0/Res/shader/prog_texture.fp
+++ b/clusterApp/Res/shader/prog_texture.fp
@@ -1,3 +1,5 @@
+precision mediump float;
+
 uniform sampler2D u_sam_tex;
 uniform float u_flt_inv_alpha;
 varying vec2 v_v2_txc;
diff --git a/insDavi2.0/Res/shader/prog_texture.vp b/clusterApp/Res/shader/prog_texture.vp
similarity index 100%
rename from insDavi2.0/Res/shader/prog_texture.vp
rename to clusterApp/Res/shader/prog_texture.vp
diff --git a/insDavi2.0/Res/shader/prog_texture_attr_alpha.fp b/clusterApp/Res/shader/prog_texture_attr_alpha.fp
similarity index 90%
rename from insDavi2.0/Res/shader/prog_texture_attr_alpha.fp
rename to clusterApp/Res/shader/prog_texture_attr_alpha.fp
index 0132077..21242c4 100644
--- a/insDavi2.0/Res/shader/prog_texture_attr_alpha.fp
+++ b/clusterApp/Res/shader/prog_texture_attr_alpha.fp
@@ -1,3 +1,5 @@
+precision mediump float;
+
 uniform sampler2D u_sam_tex;
 uniform float u_flt_inv_alpha;
 varying vec2 v_v2_txc;
diff --git a/insDavi2.0/Res/shader/prog_texture_attr_alpha.vp b/clusterApp/Res/shader/prog_texture_attr_alpha.vp
similarity index 100%
rename from insDavi2.0/Res/shader/prog_texture_attr_alpha.vp
rename to clusterApp/Res/shader/prog_texture_attr_alpha.vp
diff --git a/insDavi2.0/Res/shader/prog_texture_complex.fp b/clusterApp/Res/shader/prog_texture_complex.fp
similarity index 95%
rename from insDavi2.0/Res/shader/prog_texture_complex.fp
rename to clusterApp/Res/shader/prog_texture_complex.fp
index a4b93fb..ab57fdd 100644
--- a/insDavi2.0/Res/shader/prog_texture_complex.fp
+++ b/clusterApp/Res/shader/prog_texture_complex.fp
@@ -1,3 +1,5 @@
+precision mediump float;
+
 uniform vec4 u_v4_clr;
 //uniform sampler2D u_sam_tex;
 uniform sampler2D u_sam_tex_mask;
diff --git a/insDavi2.0/Res/shader/prog_texture_complex.vp b/clusterApp/Res/shader/prog_texture_complex.vp
similarity index 100%
rename from insDavi2.0/Res/shader/prog_texture_complex.vp
rename to clusterApp/Res/shader/prog_texture_complex.vp
diff --git a/insDavi2.0/Res/shader/prog_texture_road.fp b/clusterApp/Res/shader/prog_texture_road.fp
similarity index 92%
rename from insDavi2.0/Res/shader/prog_texture_road.fp
rename to clusterApp/Res/shader/prog_texture_road.fp
index 5ac6e82..3406baa 100644
--- a/insDavi2.0/Res/shader/prog_texture_road.fp
+++ b/clusterApp/Res/shader/prog_texture_road.fp
@@ -1,3 +1,5 @@
+precision mediump float;
+
 uniform sampler2D u_sam_tex;
 uniform vec4 u_v4_param;
 uniform float u_flt_inv_alpha;
diff --git a/insDavi2.0/Res/shader/prog_texture_road.vp b/clusterApp/Res/shader/prog_texture_road.vp
similarity index 100%
rename from insDavi2.0/Res/shader/prog_texture_road.vp
rename to clusterApp/Res/shader/prog_texture_road.vp
diff --git a/insDavi2.0/Res/shader/prog_texture_with_mask.fp b/clusterApp/Res/shader/prog_texture_with_mask.fp
similarity index 93%
rename from insDavi2.0/Res/shader/prog_texture_with_mask.fp
rename to clusterApp/Res/shader/prog_texture_with_mask.fp
index 41565b0..739d0c9 100644
--- a/insDavi2.0/Res/shader/prog_texture_with_mask.fp
+++ b/clusterApp/Res/shader/prog_texture_with_mask.fp
@@ -1,3 +1,5 @@
+precision mediump float;
+
 uniform sampler2D u_sam_tex;
 uniform sampler2D u_sam_tex_mask;
 uniform float u_flt_inv_alpha;
diff --git a/insDavi2.0/Res/shader/prog_texture_with_mask.vp b/clusterApp/Res/shader/prog_texture_with_mask.vp
similarity index 100%
rename from insDavi2.0/Res/shader/prog_texture_with_mask.vp
rename to clusterApp/Res/shader/prog_texture_with_mask.vp
diff --git a/insDavi2.0/bin/Debug/insDavi2.exe b/clusterApp/bin/Debug/insDavi2.exe
similarity index 100%
rename from insDavi2.0/bin/Debug/insDavi2.exe
rename to clusterApp/bin/Debug/insDavi2.exe
diff --git a/insDavi2.0/bin/OTA_PUBKEY.PEM b/clusterApp/bin/OTA_PUBKEY.PEM
similarity index 100%
rename from insDavi2.0/bin/OTA_PUBKEY.PEM
rename to clusterApp/bin/OTA_PUBKEY.PEM
diff --git a/insDavi2.0/bin/Release/insDavi2.exe b/clusterApp/bin/Release/insDavi2.exe
similarity index 100%
rename from insDavi2.0/bin/Release/insDavi2.exe
rename to clusterApp/bin/Release/insDavi2.exe
diff --git a/insDavi2.0/bin/i2cdetect b/clusterApp/bin/i2cdetect
similarity index 100%
rename from insDavi2.0/bin/i2cdetect
rename to clusterApp/bin/i2cdetect
diff --git a/insDavi2.0/bin/i2cdump b/clusterApp/bin/i2cdump
similarity index 100%
rename from insDavi2.0/bin/i2cdump
rename to clusterApp/bin/i2cdump
diff --git a/insDavi2.0/bin/i2cget b/clusterApp/bin/i2cget
similarity index 100%
rename from insDavi2.0/bin/i2cget
rename to clusterApp/bin/i2cget
diff --git a/insDavi2.0/bin/i2cset b/clusterApp/bin/i2cset
similarity index 100%
rename from insDavi2.0/bin/i2cset
rename to clusterApp/bin/i2cset
diff --git a/insDavi2.0/bin/i2ctransfer b/clusterApp/bin/i2ctransfer
similarity index 100%
rename from insDavi2.0/bin/i2ctransfer
rename to clusterApp/bin/i2ctransfer
diff --git a/insDavi2.0/bin/initupd.sh b/clusterApp/bin/initupd.sh
similarity index 100%
rename from insDavi2.0/bin/initupd.sh
rename to clusterApp/bin/initupd.sh
diff --git a/clusterApp/bin/instApp b/clusterApp/bin/instApp
new file mode 100644
index 0000000..072f1c0
Binary files /dev/null and b/clusterApp/bin/instApp differ
diff --git a/insDavi2.0/bin/openssl b/clusterApp/bin/openssl
similarity index 100%
rename from insDavi2.0/bin/openssl
rename to clusterApp/bin/openssl
diff --git a/insDavi2.0/bin/openssl.cnf b/clusterApp/bin/openssl.cnf
similarity index 100%
rename from insDavi2.0/bin/openssl.cnf
rename to clusterApp/bin/openssl.cnf
diff --git a/insDavi2.0/bin/rsa_public_key.pem b/clusterApp/bin/rsa_public_key.pem
similarity index 100%
rename from insDavi2.0/bin/rsa_public_key.pem
rename to clusterApp/bin/rsa_public_key.pem
diff --git a/insDavi2.0/bin/startup.sh b/clusterApp/bin/startup.sh
similarity index 100%
rename from insDavi2.0/bin/startup.sh
rename to clusterApp/bin/startup.sh
diff --git a/insDavi2.0/bin/xmodem_linux_arm b/clusterApp/bin/xmodem_linux_arm
similarity index 100%
rename from insDavi2.0/bin/xmodem_linux_arm
rename to clusterApp/bin/xmodem_linux_arm
diff --git a/insDavi2.0/genTxtRes.bat b/clusterApp/genTxtRes.bat
similarity index 100%
rename from insDavi2.0/genTxtRes.bat
rename to clusterApp/genTxtRes.bat
diff --git a/insDavi2.0/gmon.out b/clusterApp/gmon.out
similarity index 100%
rename from insDavi2.0/gmon.out
rename to clusterApp/gmon.out
diff --git a/insDavi2.0/include/BaseTypes.h b/clusterApp/include/BaseTypes.h
similarity index 100%
rename from insDavi2.0/include/BaseTypes.h
rename to clusterApp/include/BaseTypes.h
diff --git a/insDavi2.0/include/InsCfg.h b/clusterApp/include/InsCfg.h
similarity index 100%
rename from insDavi2.0/include/InsCfg.h
rename to clusterApp/include/InsCfg.h
diff --git a/insDavi2.0/include/InsDbg.h b/clusterApp/include/InsDbg.h
similarity index 100%
rename from insDavi2.0/include/InsDbg.h
rename to clusterApp/include/InsDbg.h
diff --git a/insDavi2.0/include/InsRender.h b/clusterApp/include/InsRender.h
similarity index 100%
rename from insDavi2.0/include/InsRender.h
rename to clusterApp/include/InsRender.h
diff --git a/insDavi2.0/include/InsRes.h b/clusterApp/include/InsRes.h
similarity index 100%
rename from insDavi2.0/include/InsRes.h
rename to clusterApp/include/InsRes.h
diff --git a/insDavi2.0/include/InsTask.h b/clusterApp/include/InsTask.h
similarity index 100%
rename from insDavi2.0/include/InsTask.h
rename to clusterApp/include/InsTask.h
diff --git a/insDavi2.0/include/InsTask/CduCommunication.h b/clusterApp/include/InsTask/CduCommunication.h
similarity index 100%
rename from insDavi2.0/include/InsTask/CduCommunication.h
rename to clusterApp/include/InsTask/CduCommunication.h
diff --git a/insDavi2.0/include/InsTask/DisplayRender.h b/clusterApp/include/InsTask/DisplayRender.h
similarity index 100%
rename from insDavi2.0/include/InsTask/DisplayRender.h
rename to clusterApp/include/InsTask/DisplayRender.h
diff --git a/insDavi2.0/include/InsTask/MainBoardCommunication.h b/clusterApp/include/InsTask/MainBoardCommunication.h
similarity index 100%
rename from insDavi2.0/include/InsTask/MainBoardCommunication.h
rename to clusterApp/include/InsTask/MainBoardCommunication.h
diff --git a/insDavi2.0/include/InsTask/ResourceLoader.h b/clusterApp/include/InsTask/ResourceLoader.h
similarity index 100%
rename from insDavi2.0/include/InsTask/ResourceLoader.h
rename to clusterApp/include/InsTask/ResourceLoader.h
diff --git a/insDavi2.0/include/Protocol/Cdu_TCP.h b/clusterApp/include/Protocol/Cdu_TCP.h
similarity index 100%
rename from insDavi2.0/include/Protocol/Cdu_TCP.h
rename to clusterApp/include/Protocol/Cdu_TCP.h
diff --git a/insDavi2.0/include/Protocol/Cdu_TCP_App.h b/clusterApp/include/Protocol/Cdu_TCP_App.h
similarity index 100%
rename from insDavi2.0/include/Protocol/Cdu_TCP_App.h
rename to clusterApp/include/Protocol/Cdu_TCP_App.h
diff --git a/insDavi2.0/include/Protocol/MainBoard_IIC.h b/clusterApp/include/Protocol/MainBoard_IIC.h
similarity index 100%
rename from insDavi2.0/include/Protocol/MainBoard_IIC.h
rename to clusterApp/include/Protocol/MainBoard_IIC.h
diff --git a/insDavi2.0/include/Protocol/MainBoard_IIC_App.h b/clusterApp/include/Protocol/MainBoard_IIC_App.h
similarity index 100%
rename from insDavi2.0/include/Protocol/MainBoard_IIC_App.h
rename to clusterApp/include/Protocol/MainBoard_IIC_App.h
diff --git a/insDavi2.0/include/Protocol/MainBoard_IIC_Sys.h b/clusterApp/include/Protocol/MainBoard_IIC_Sys.h
similarity index 100%
rename from insDavi2.0/include/Protocol/MainBoard_IIC_Sys.h
rename to clusterApp/include/Protocol/MainBoard_IIC_Sys.h
diff --git a/insDavi2.0/include/lib/InsFont.h b/clusterApp/include/lib/InsFont.h
similarity index 100%
rename from insDavi2.0/include/lib/InsFont.h
rename to clusterApp/include/lib/InsFont.h
diff --git a/insDavi2.0/include/lib/InsGL.h b/clusterApp/include/lib/InsGL.h
similarity index 100%
rename from insDavi2.0/include/lib/InsGL.h
rename to clusterApp/include/lib/InsGL.h
diff --git a/insDavi2.0/include/lib/InsJpeg.h b/clusterApp/include/lib/InsJpeg.h
similarity index 100%
rename from insDavi2.0/include/lib/InsJpeg.h
rename to clusterApp/include/lib/InsJpeg.h
diff --git a/insDavi2.0/include/lib/InsMatrix.h b/clusterApp/include/lib/InsMatrix.h
similarity index 100%
rename from insDavi2.0/include/lib/InsMatrix.h
rename to clusterApp/include/lib/InsMatrix.h
diff --git a/insDavi2.0/include/lib/InsPng.h b/clusterApp/include/lib/InsPng.h
similarity index 100%
rename from insDavi2.0/include/lib/InsPng.h
rename to clusterApp/include/lib/InsPng.h
diff --git a/insDavi2.0/include/lib/InsQueue.h b/clusterApp/include/lib/InsQueue.h
similarity index 100%
rename from insDavi2.0/include/lib/InsQueue.h
rename to clusterApp/include/lib/InsQueue.h
diff --git a/insDavi2.0/include/lib/cJSON.h b/clusterApp/include/lib/cJSON.h
similarity index 100%
rename from insDavi2.0/include/lib/cJSON.h
rename to clusterApp/include/lib/cJSON.h
diff --git a/insDavi2.0/insDavi2.0.cbp b/clusterApp/insDavi2.0.cbp
similarity index 100%
rename from insDavi2.0/insDavi2.0.cbp
rename to clusterApp/insDavi2.0.cbp
diff --git a/insDavi2.0/insDavi2.0.cscope_file_list b/clusterApp/insDavi2.0.cscope_file_list
similarity index 100%
rename from insDavi2.0/insDavi2.0.cscope_file_list
rename to clusterApp/insDavi2.0.cscope_file_list
diff --git a/insDavi2.0/insDavi2.0.depend b/clusterApp/insDavi2.0.depend
similarity index 100%
rename from insDavi2.0/insDavi2.0.depend
rename to clusterApp/insDavi2.0.depend
diff --git a/insDavi2.0/insDavi2.0.layout b/clusterApp/insDavi2.0.layout
similarity index 100%
rename from insDavi2.0/insDavi2.0.layout
rename to clusterApp/insDavi2.0.layout
diff --git a/insDavi2.0/libcjson.dll b/clusterApp/libcjson.dll
similarity index 100%
rename from insDavi2.0/libcjson.dll
rename to clusterApp/libcjson.dll
diff --git a/insDavi2.0/libpng16.dll b/clusterApp/libpng16.dll
similarity index 100%
rename from insDavi2.0/libpng16.dll
rename to clusterApp/libpng16.dll
diff --git a/insDavi2.0/libzlib.dll b/clusterApp/libzlib.dll
similarity index 100%
rename from insDavi2.0/libzlib.dll
rename to clusterApp/libzlib.dll
diff --git a/insDavi2.0/main.c b/clusterApp/main.c
similarity index 100%
rename from insDavi2.0/main.c
rename to clusterApp/main.c
diff --git a/insDavi2.0/src/InsRender/Render.c b/clusterApp/src/InsRender/Render.c
similarity index 99%
rename from insDavi2.0/src/InsRender/Render.c
rename to clusterApp/src/InsRender/Render.c
index 31a84bf..8b8f4fa 100644
--- a/insDavi2.0/src/InsRender/Render.c
+++ b/clusterApp/src/InsRender/Render.c
@@ -37,6 +37,7 @@
 #endif
 #endif // SLEEP
 
+
 typedef enum
 {
     POWER_ON_BMP_PLAYING = 0,
diff --git a/insDavi2.0/src/InsRender/RenderUtils.c b/clusterApp/src/InsRender/RenderUtils.c
similarity index 100%
rename from insDavi2.0/src/InsRender/RenderUtils.c
rename to clusterApp/src/InsRender/RenderUtils.c
diff --git a/insDavi2.0/src/InsRender/RenderUtils.h b/clusterApp/src/InsRender/RenderUtils.h
similarity index 71%
rename from insDavi2.0/src/InsRender/RenderUtils.h
rename to clusterApp/src/InsRender/RenderUtils.h
index 1c703e6..1120dba 100644
--- a/insDavi2.0/src/InsRender/RenderUtils.h
+++ b/clusterApp/src/InsRender/RenderUtils.h
@@ -16,7 +16,7 @@
 #include <GLES2/gl2ext.h>
 
 #ifndef GL_CLAMP_TO_BORDER
-#define GL_CLAMP_TO_BORDER GL_CLAMP_TO_BORDER_VIV
+#define GL_CLAMP_TO_BORDER GL_CLAMP_TO_BORDER_NV
 #endif // GL_CLAMP_TO_BORDER
 
 #include <sys/time.h>
@@ -74,10 +74,10 @@ void PrintCurrentTimeMs();
 #endif // COMPILE_IN_WINDOWS
 
 /**
- * 加载Tga文件
- * @fileName [in]文件路径名
- * @image [out]图像信息
- * 返回加载结果: 加载成功 INS_TRUE, 加载失败 INS_FALSE
+ * 锟斤拷锟斤拷Tga锟侥硷拷
+ * @fileName [in]锟侥硷拷路锟斤拷锟斤拷
+ * @image [out]图锟斤拷锟斤拷息
+ * 锟斤拷锟截硷拷锟截斤拷锟�: 锟斤拷锟截成癸拷 INS_TRUE, 锟斤拷锟斤拷失锟斤拷 INS_FALSE
  */
 Int08 LoadTga
 (
@@ -92,10 +92,10 @@ Int08 LoadVbo
 );
 
 /**
- * 加载shader程序对
- * @szVtxProg [in]顶点着色器代码文件路径
- * @szFrgProg [in]片段着色器代码文件路径
- * 返回加载结果: 加载成功 shader ID, 加载失败 INS_INVALID_RES_ID
+ * 锟斤拷锟斤拷shader锟斤拷锟斤拷锟�
+ * @szVtxProg [in]锟斤拷锟斤拷锟斤拷色锟斤拷锟斤拷锟斤拷锟侥硷拷路锟斤拷
+ * @szFrgProg [in]片锟斤拷锟斤拷色锟斤拷锟斤拷锟斤拷锟侥硷拷路锟斤拷
+ * 锟斤拷锟截硷拷锟截斤拷锟�: 锟斤拷锟截成癸拷 shader ID, 锟斤拷锟斤拷失锟斤拷 INS_INVALID_RES_ID
  */
 GLuint LoadShaderPair
 (
@@ -104,13 +104,13 @@ GLuint LoadShaderPair
 );
 
 /**
- * 设置透视投影参数
- * @fovy [in]视角(夹角角度)
- * @dspWidth [in]显示区域宽度
- * @dspHigh [in]显示区域高度
- * @zNear [in]近截取深度(正值)
- * @zFar [in]远截取深度(正值)
- * 返回设置结果: 参数设置有效 INS_TRUE, 参数设置无效 INS_FALSE
+ * 锟斤拷锟斤拷透锟斤拷投影锟斤拷锟斤拷
+ * @fovy [in]锟接斤拷(锟叫角角讹拷)
+ * @dspWidth [in]锟斤拷示锟斤拷锟斤拷锟斤拷锟�
+ * @dspHigh [in]锟斤拷示锟斤拷锟斤拷叨锟�
+ * @zNear [in]锟斤拷锟斤拷取锟斤拷锟�(锟斤拷值)
+ * @zFar [in]远锟斤拷取锟斤拷锟�(锟斤拷值)
+ * 锟斤拷锟斤拷锟斤拷锟矫斤拷锟�: 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷效 INS_TRUE, 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷效 INS_FALSE
  */
 Bool SetPerspectiveParameters
 (
@@ -129,13 +129,13 @@ void CollectMergeRect
 );
 
 /**
- * 获取透视投影参数
- * @fovy [out]视角(夹角角度)
- * @dspWidth [out]显示区域宽度
- * @dspHigh [out]显示区域高度
- * @zNear [out]近截取深度(正值)
- * @zFar [out]远截取深度(正值)
- * 返回无
+ * 锟斤拷取透锟斤拷投影锟斤拷锟斤拷
+ * @fovy [out]锟接斤拷(锟叫角角讹拷)
+ * @dspWidth [out]锟斤拷示锟斤拷锟斤拷锟斤拷锟�
+ * @dspHigh [out]锟斤拷示锟斤拷锟斤拷叨锟�
+ * @zNear [out]锟斤拷锟斤拷取锟斤拷锟�(锟斤拷值)
+ * @zFar [out]远锟斤拷取锟斤拷锟�(锟斤拷值)
+ * 锟斤拷锟斤拷锟斤拷
  */
 void GetPerspectiveParameters
 (
@@ -147,9 +147,9 @@ void GetPerspectiveParameters
 );
 
 /**
- * 计算并取得透视投影矩阵
- * @mat4x4 [out]透视投影矩阵
- * 返回无
+ * 锟斤拷锟姐并取锟斤拷透锟斤拷投影锟斤拷锟斤拷
+ * @mat4x4 [out]透锟斤拷投影锟斤拷锟斤拷
+ * 锟斤拷锟斤拷锟斤拷
  */
 void CalcPerspectiveMatrix
 (
@@ -209,13 +209,13 @@ void DrawGlClrTriangleStrip
 );
 
 /**
- * 绘制图片(矩形)
+ * 锟斤拷锟斤拷图片(锟斤拷锟斤拷)
  * @zTrans Z depth
- * @rect 图片矩形信息,(x, y, w, h: 左上角定位xy, 尺寸wh)
+ * @rect 图片锟斤拷锟斤拷锟斤拷息,(x, y, w, h: 锟斤拷锟较角讹拷位xy, 锟竭达拷wh)
  * @hVtx shader handle vertex
  * @hTxc shader handle texcoord
- @ @txc 纹理坐标, Triangle Fans 顺序(左下, 右下, 右上, 左上)
- @ @tex 纹理ID
+ @ @txc 锟斤拷锟斤拷锟斤拷锟斤拷, Triangle Fans 顺锟斤拷(锟斤拷锟斤拷, 锟斤拷锟斤拷, 锟斤拷锟斤拷, 锟斤拷锟斤拷)
+ @ @tex 锟斤拷锟斤拷ID
  */
 void DrawGlPicRect
 (
@@ -228,13 +228,13 @@ void DrawGlPicRect
 );
 
 /**
- * 绘制图片(矩形)
+ * 锟斤拷锟斤拷图片(锟斤拷锟斤拷)
  * @zTrans Z depth
- * @rect 图片矩形信息,(x, y, w, h: 左上角定位xy, 尺寸wh)
+ * @rect 图片锟斤拷锟斤拷锟斤拷息,(x, y, w, h: 锟斤拷锟较角讹拷位xy, 锟竭达拷wh)
  * @hVtx shader handle vertex
  * @hTxc shader handle texcoord
- @ @txc 纹理坐标, Triangle Fans 顺序(左下, 右下, 右上, 左上)
- @ @tex 纹理ID
+ @ @txc 锟斤拷锟斤拷锟斤拷锟斤拷, Triangle Fans 顺锟斤拷(锟斤拷锟斤拷, 锟斤拷锟斤拷, 锟斤拷锟斤拷, 锟斤拷锟斤拷)
+ @ @tex 锟斤拷锟斤拷ID
  */
 void DrawGlHorRollPicRect
 (
@@ -249,13 +249,13 @@ void DrawGlHorRollPicRect
 );
 
 /**
- * 绘制图片(矩形)
+ * 锟斤拷锟斤拷图片(锟斤拷锟斤拷)
  * @zTrans Z depth
- * @rect 图片矩形信息,(x, y, w, h: 左上角定位xy, 尺寸wh)
+ * @rect 图片锟斤拷锟斤拷锟斤拷息,(x, y, w, h: 锟斤拷锟较角讹拷位xy, 锟竭达拷wh)
  * @hVtx shader handle vertex
  * @hTxc shader handle texcoord
- @ @txc 纹理坐标, Triangle Fans 顺序(左下, 右下, 右上, 左上)
- @ @tex 纹理ID
+ @ @txc 锟斤拷锟斤拷锟斤拷锟斤拷, Triangle Fans 顺锟斤拷(锟斤拷锟斤拷, 锟斤拷锟斤拷, 锟斤拷锟斤拷, 锟斤拷锟斤拷)
+ @ @tex 锟斤拷锟斤拷ID
  */
 void DrawRotzGlPicRect
 (
diff --git a/insDavi2.0/src/InsRender/Res_BmpPool.h b/clusterApp/src/InsRender/Res_BmpPool.h
similarity index 100%
rename from insDavi2.0/src/InsRender/Res_BmpPool.h
rename to clusterApp/src/InsRender/Res_BmpPool.h
diff --git a/insDavi2.0/src/InsRender/Res_Dds.h b/clusterApp/src/InsRender/Res_Dds.h
similarity index 100%
rename from insDavi2.0/src/InsRender/Res_Dds.h
rename to clusterApp/src/InsRender/Res_Dds.h
diff --git a/insDavi2.0/src/InsRender/Res_Font.h b/clusterApp/src/InsRender/Res_Font.h
similarity index 100%
rename from insDavi2.0/src/InsRender/Res_Font.h
rename to clusterApp/src/InsRender/Res_Font.h
diff --git a/insDavi2.0/src/InsRender/Res_Model.h b/clusterApp/src/InsRender/Res_Model.h
similarity index 100%
rename from insDavi2.0/src/InsRender/Res_Model.h
rename to clusterApp/src/InsRender/Res_Model.h
diff --git a/insDavi2.0/src/InsRender/Res_Png.h b/clusterApp/src/InsRender/Res_Png.h
similarity index 100%
rename from insDavi2.0/src/InsRender/Res_Png.h
rename to clusterApp/src/InsRender/Res_Png.h
diff --git a/insDavi2.0/src/InsRender/Res_Shader.h b/clusterApp/src/InsRender/Res_Shader.h
similarity index 100%
rename from insDavi2.0/src/InsRender/Res_Shader.h
rename to clusterApp/src/InsRender/Res_Shader.h
diff --git a/insDavi2.0/src/InsRender/Res_Tga.h b/clusterApp/src/InsRender/Res_Tga.h
similarity index 100%
rename from insDavi2.0/src/InsRender/Res_Tga.h
rename to clusterApp/src/InsRender/Res_Tga.h
diff --git a/insDavi2.0/src/InsRender/Res_Txt.c.bkup b/clusterApp/src/InsRender/Res_Txt.c.bkup
similarity index 100%
rename from insDavi2.0/src/InsRender/Res_Txt.c.bkup
rename to clusterApp/src/InsRender/Res_Txt.c.bkup
diff --git a/insDavi2.0/src/InsRender/Res_Txt.h b/clusterApp/src/InsRender/Res_Txt.h
similarity index 100%
rename from insDavi2.0/src/InsRender/Res_Txt.h
rename to clusterApp/src/InsRender/Res_Txt.h
diff --git a/insDavi2.0/src/InsRender/Res_TxtBasic.c b/clusterApp/src/InsRender/Res_TxtBasic.c
similarity index 100%
rename from insDavi2.0/src/InsRender/Res_TxtBasic.c
rename to clusterApp/src/InsRender/Res_TxtBasic.c
diff --git a/insDavi2.0/src/InsRender/Res_TxtBasic.h b/clusterApp/src/InsRender/Res_TxtBasic.h
similarity index 100%
rename from insDavi2.0/src/InsRender/Res_TxtBasic.h
rename to clusterApp/src/InsRender/Res_TxtBasic.h
diff --git a/insDavi2.0/src/InsRender/Res_TxtHintAlarm.c b/clusterApp/src/InsRender/Res_TxtHintAlarm.c
similarity index 100%
rename from insDavi2.0/src/InsRender/Res_TxtHintAlarm.c
rename to clusterApp/src/InsRender/Res_TxtHintAlarm.c
diff --git a/insDavi2.0/src/InsRender/Res_TxtHintAlarm.h b/clusterApp/src/InsRender/Res_TxtHintAlarm.h
similarity index 100%
rename from insDavi2.0/src/InsRender/Res_TxtHintAlarm.h
rename to clusterApp/src/InsRender/Res_TxtHintAlarm.h
diff --git a/insDavi2.0/src/InsTask/CduCommunication.c b/clusterApp/src/InsTask/CduCommunication.c
similarity index 100%
rename from insDavi2.0/src/InsTask/CduCommunication.c
rename to clusterApp/src/InsTask/CduCommunication.c
diff --git a/insDavi2.0/src/InsTask/DisplayRender.c b/clusterApp/src/InsTask/DisplayRender.c
similarity index 99%
rename from insDavi2.0/src/InsTask/DisplayRender.c
rename to clusterApp/src/InsTask/DisplayRender.c
index ac31b7f..1ace356 100644
--- a/insDavi2.0/src/InsTask/DisplayRender.c
+++ b/clusterApp/src/InsTask/DisplayRender.c
@@ -64,7 +64,7 @@ const InsTask gDisplayRender =
 static void  DR_Task_FeedDog();
 static void* DR_Task_Render(void* argv);
 #ifndef COMPILE_IN_WINDOWS
-static void* DR_Task_Render2(void* argv);
+//static void* DR_Task_Render2(void* argv);
 #endif // COMPILE_IN_WINDOWS
 
 static Int08 mDr_Task_Stop = INS_TRUE;
diff --git a/insDavi2.0/src/InsTask/DisplayRender.c.save-failed b/clusterApp/src/InsTask/DisplayRender.c.save-failed
similarity index 100%
rename from insDavi2.0/src/InsTask/DisplayRender.c.save-failed
rename to clusterApp/src/InsTask/DisplayRender.c.save-failed
diff --git a/insDavi2.0/src/InsTask/MainBoardCommunication.c b/clusterApp/src/InsTask/MainBoardCommunication.c
similarity index 99%
rename from insDavi2.0/src/InsTask/MainBoardCommunication.c
rename to clusterApp/src/InsTask/MainBoardCommunication.c
index ba14ebb..69f1a40 100644
--- a/insDavi2.0/src/InsTask/MainBoardCommunication.c
+++ b/clusterApp/src/InsTask/MainBoardCommunication.c
@@ -72,7 +72,7 @@ static Bool MBC_Task_Init()
     {
         goto TAG_MBC_Task_Init_ERR_1;
     }
-
+//#if (!defined COMPILE_IN_WINDOWS && !defined COMPILE_IN_UBUNTU)
 #ifndef COMPILE_IN_WINDOWS
 
     mMbcI2cReq.frame_len = I2C_FRAMELEN;
diff --git a/insDavi2.0/src/InsTask/ResourceLoader.c b/clusterApp/src/InsTask/ResourceLoader.c
similarity index 100%
rename from insDavi2.0/src/InsTask/ResourceLoader.c
rename to clusterApp/src/InsTask/ResourceLoader.c
diff --git a/insDavi2.0/src/InsTask/utils_i2c.c b/clusterApp/src/InsTask/utils_i2c.c
similarity index 100%
rename from insDavi2.0/src/InsTask/utils_i2c.c
rename to clusterApp/src/InsTask/utils_i2c.c
diff --git a/insDavi2.0/src/InsTask/utils_i2c.h b/clusterApp/src/InsTask/utils_i2c.h
similarity index 100%
rename from insDavi2.0/src/InsTask/utils_i2c.h
rename to clusterApp/src/InsTask/utils_i2c.h
diff --git a/insDavi2.0/src/Protocol/Cdu_TCP.c b/clusterApp/src/Protocol/Cdu_TCP.c
similarity index 100%
rename from insDavi2.0/src/Protocol/Cdu_TCP.c
rename to clusterApp/src/Protocol/Cdu_TCP.c
diff --git a/insDavi2.0/src/Protocol/MainBoard_IIC.c b/clusterApp/src/Protocol/MainBoard_IIC.c
similarity index 100%
rename from insDavi2.0/src/Protocol/MainBoard_IIC.c
rename to clusterApp/src/Protocol/MainBoard_IIC.c
diff --git a/insDavi2.0/src/lib/InsFont.c b/clusterApp/src/lib/InsFont.c
similarity index 100%
rename from insDavi2.0/src/lib/InsFont.c
rename to clusterApp/src/lib/InsFont.c
diff --git a/clusterApp/src/lib/InsGL.c b/clusterApp/src/lib/InsGL.c
new file mode 100644
index 0000000..7ca3b9a
--- /dev/null
+++ b/clusterApp/src/lib/InsGL.c
@@ -0,0 +1,769 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <InsCfg.h>
+#include <lib/InsGL.h>
+
+#define DBG_LEVEL DBG_INFO
+#define DBG_TAG "LibGL"
+#include <InsDbg.h>
+
+#ifdef COMPILE_IN_WINDOWS
+
+#include <windows.h>
+#define GLEW_STATIC
+#include <GL/glew.h>
+
+static HDC mHDc;
+static HGLRC mHGlrc;
+
+#else
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <assert.h>
+#include <EGL/egl.h>
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+
+
+// 闇�瑕佸寘鍚殑澶存枃浠�
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <xf86drm.h>      // DRM 鏍稿績鍔熻兘
+#include <xf86drmMode.h>  // KMS 妯″紡璁剧疆
+#include <gbm.h>           // GBM 缂撳啿绠＄悊
+#include <EGL/egl.h>       // EGL 涓婁笅鏂囩鐞�
+#include <GL/gl.h>         // OpenGL
+#include <errno.h>
+
+
+#define MXCFB_SET_GBL_ALPHA _IOW('F', 0x21, struct mxcfb_gbl_alpha)
+#define MXCFB_SET_CLR_KEY _IOW('F', 0x22, struct mxcfb_color_key)
+
+struct mxcfb_gbl_alpha {
+        int enable;
+        int alpha;
+};
+
+struct mxcfb_color_key {
+        int enable;
+        unsigned int color_key;
+};
+
+//static const EGLint egl_config_attribs[] =
+//{
+//    EGL_RED_SIZE,     8,
+//    EGL_GREEN_SIZE,   8,
+//    EGL_BLUE_SIZE,    8,
+//    EGL_ALPHA_SIZE,   EGL_DONT_CARE,
+//    EGL_DEPTH_SIZE,   16,
+//    EGL_SAMPLES,      0,
+//    EGL_SAMPLE_BUFFERS,   0,
+//    EGL_STENCIL_SIZE, 3,
+//    EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
+//    EGL_NONE,
+//};
+
+static const EGLint egl_config_attribs[] =
+{
+    EGL_RED_SIZE,     8,
+    EGL_GREEN_SIZE,   8,
+    EGL_BLUE_SIZE,    8,
+    EGL_ALPHA_SIZE,   0,
+    EGL_DEPTH_SIZE,   16,
+    EGL_SAMPLES,      0,
+    EGL_SAMPLE_BUFFERS,   0,
+    EGL_STENCIL_SIZE, 0,
+    EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
+    EGL_NONE,
+};
+
+//static const EGLint egl_config_attribs[] =
+//{
+//    EGL_RED_SIZE,     8,
+//    EGL_GREEN_SIZE,   8,
+//    EGL_BLUE_SIZE,    8,
+//    EGL_ALPHA_SIZE,   0,
+//    EGL_DEPTH_SIZE,   16,
+//    EGL_SAMPLES,      1,
+//    EGL_SAMPLE_BUFFERS,   4,
+//    EGL_STENCIL_SIZE, 0,
+//    EGL_NONE,
+//};
+
+//static const EGLint egl_config_attribs[] =
+//{
+//    EGL_RED_SIZE,     8,
+//    EGL_GREEN_SIZE,   8,
+//    EGL_BLUE_SIZE,    8,
+//    EGL_ALPHA_SIZE,   0,
+//    EGL_DEPTH_SIZE,   16,
+//    EGL_SAMPLES,      1,
+//    EGL_SAMPLE_BUFFERS,   4,
+//    EGL_STENCIL_SIZE, 0,
+//    EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
+//    EGL_NONE,
+//};
+
+static EGLDisplay	egl_display;
+static EGLSurface	eglsurface;
+static EGLContext	eglcontext;
+static Bool egl_init_flg = INS_FALSE;
+
+#ifndef COMPILE_IN_WINDOWS
+static EGLDisplay	egl_display_1;
+static EGLSurface	eglsurface_fb1;
+static EGLContext	eglcontext_fb1;
+static Bool egl_init_flg_fb1 = INS_FALSE;
+#endif // COMPILE_IN_WINDOWS
+
+#endif // COMPILE_IN_WINDOWS
+
+
+
+// DRM 鐨� GEM 鍒涘缓 ioctl 缁撴瀯浣擄紙闇�瑕佹牴鎹綘鐨� DRM 椹卞姩璋冩暣锛�
+typedef struct  {
+    uint32_t height;
+    uint32_t width;
+    uint32_t bpp;
+    uint32_t flags;
+    uint32_t handle;
+    uint32_t pitch;
+    uint64_t size;
+}drm_mode_create_dumb;
+
+#ifdef COMPILE_IN_WINDOWS
+Bool InitGL()
+{
+    PIXELFORMATDESCRIPTOR pfd;
+
+    int iFormat;
+    GLenum glewInitFlg;
+
+    /* get the device context (DC) */
+    mHDc = GetDC(InsRenderHwnd);
+
+    /* set the pixel format for the DC */
+    ZeroMemory(&pfd, sizeof(pfd));
+
+    pfd.nSize = sizeof(pfd);
+    pfd.nVersion = 1;
+    pfd.dwFlags = PFD_DRAW_TO_WINDOW |  /// 支锟斤拷锟节达拷锟斤拷锟叫伙拷图
+                  PFD_SUPPORT_OPENGL |  /// 支锟斤拷 OpenGL
+                  PFD_DOUBLEBUFFER;     /// 双锟斤拷锟斤拷模式
+    pfd.iPixelType = PFD_TYPE_RGBA;     /// RGBA 锟斤拷色模式
+    pfd.cColorBits = 24;                /// 24 位锟斤拷色锟斤拷锟�
+    pfd.cDepthBits = 16;                /// 16 位锟斤拷然锟斤拷锟�
+    pfd.iLayerType = PFD_MAIN_PLANE;    /// 锟斤拷锟斤拷
+
+    iFormat = ChoosePixelFormat(mHDc, &pfd);
+
+    SetPixelFormat(mHDc, iFormat, &pfd);
+
+    /* create and enable the render context (RC) */
+    mHGlrc = wglCreateContext(mHDc);
+
+    wglMakeCurrent(mHDc, mHGlrc);
+
+    glewInitFlg = glewInit();
+    if(glewInitFlg != GLEW_OK)
+    {
+        const GLubyte *errinfo;
+        errinfo = glewGetErrorString(glewInitFlg);
+        DBG_Log(DBG_ERROR, "GLEW init error:\n%s\n", errinfo);
+    }
+    return INS_TRUE;
+}
+#else
+
+
+int create_dumb_buffer(int drm_fd, uint32_t width, uint32_t height, 
+                       uint32_t bpp, uint32_t *handle, uint32_t *pitch, uint64_t *size) {
+    drm_mode_create_dumb create = {
+        .width = width,
+        .height = height,
+        .bpp = bpp,
+        .flags = 0,
+    };
+    
+    // 鍒涘缓 dumb buffer
+    if (drmIoctl(drm_fd, DRM_IOCTL_MODE_CREATE_DUMB, &create) != 0) {
+        fprintf(stderr, "DRM_IOCTL_MODE_CREATE_DUMB failed.\n");
+        return -1;
+    }
+    
+    *handle = create.handle;
+    *pitch = create.pitch;
+    *size = create.size;
+    
+    return 0;
+}
+
+Bool InitGL(Int32 x, Int32 y, Int32 w, Int32 h, Int32 *rtw, Int32 *rth)
+{
+    #define MAX_CFG_NUM 100
+	EGLint numconfigs;
+	EGLConfig			 eglconfig[MAX_CFG_NUM];
+	EGLNativeWindowType  eglNativeWindow;
+	EGLNativeDisplayType eglNativeDisplayType;
+
+    printf("InitGL\n");
+
+#if 0
+	UInt08 fb;
+
+	struct mxcfb_color_key key;
+	struct mxcfb_gbl_alpha gbl_alpha;
+
+	fb = open("/dev/fb0", O_RDWR, 0);
+	if(fb < 0)
+    {
+        printf("open /dev/fb0 fail.\n");
+    }
+
+	key.enable = 1;
+	key.color_key = 0x0;//0xff000000;
+	if(ioctl(fb, MXCFB_SET_CLR_KEY, &key) < 0)
+    {
+        printf("MXCFB_SET_CLR_KEY fail.\n");
+    }
+
+	gbl_alpha.enable = 1;
+	gbl_alpha.alpha = 0xff;
+	if(ioctl(fb, MXCFB_SET_GBL_ALPHA, &gbl_alpha) < 0)
+    {
+        printf("MXCFB_SET_GBL_ALPHA fail.\n");
+    }
+
+	close(fb);
+
+#else
+
+    uint32_t handle, pitch, fb_id;
+    uint64_t size;
+
+    // ========== 1. 鍒濆鍖� DRM/KMS ==========
+    int drm_fd = open("/dev/dri/card0", O_RDWR);
+    if (drm_fd < 0) 
+    { 
+        printf("open /dev/dri/card0 failed.\r\n"); 
+        return 1; 
+    }
+    
+        printf("open /dev/dri/card0 success.\r\n"); 
+    // 鑾峰彇 DRM 璧勬簮锛堟樉绀鸿繛鎺ュ櫒銆佺紪鐮佸櫒绛夛級
+    drmModeRes *resources = NULL;
+    resources = drmModeGetResources(drm_fd);
+    if (NULL == resources)
+    {
+        printf("resources is not found \n");
+        return 1;
+    }
+    printf("resources is found \n");
+    // 鏌ユ壘绗竴涓凡杩炴帴鐨勬樉绀哄櫒锛圕onnector锛�
+    drmModeConnector *connector = NULL;
+    for (int i = 0; i < resources->count_connectors; i++) {
+        connector = drmModeGetConnector(drm_fd, resources->connectors[i]);
+        if (connector->connection == DRM_MODE_CONNECTED) {
+            break; // 鎵惧埌涓�涓凡杩炴帴鐨勬樉绀哄櫒
+        }
+        drmModeFreeConnector(connector);
+        connector = NULL;
+    }
+    if (!connector) { printf("connector is not found \n"); return 1; }
+
+    printf("connector is found \n");
+    // 鑾峰彇鏄剧ず鍣ㄧ殑绗竴涓彲鐢ㄥ垎杈ㄧ巼妯″紡锛圡ode锛�
+    drmModeModeInfo *mode = &connector->modes[0];
+    // 涓鸿繖涓樉绀哄櫒鍒涘缓涓�涓� Framebuffer锛堝唴鏍稿璞★紝涓嶆槸鏄惧瓨锛�
+    //uint32_t fb_id;
+    // int fb = drmModeAddFB(drm_fd, w, h, 24, 32, w*4, 0, &fb_id);
+    // if (fb < 0)
+    // {
+    //     printf("Create Framebuffer failed \n");
+    //     return 1;
+    // }
+    // printf("Create Framebuffer success \n");
+    
+
+     // 鍒涘缓 dumb buffer锛�32 bpp = 4 bytes per pixel锛�
+    if (create_dumb_buffer(drm_fd, w, h, 32, &handle, &pitch, &size) != 0) {
+        printf("Create dumb buffer failed\n");
+        close(drm_fd);
+        return 1;
+    }
+    printf("Created dumb buffer: handle=%u, pitch=%u, size=%llu\n", 
+           handle, pitch, (unsigned long long)size);
+
+    // 浣跨敤鏈夋晥鐨� handle 鍒涘缓 framebuffer
+    int ret = drmModeAddFB(drm_fd, w, h, 24, 32, pitch, handle, &fb_id);
+    if (ret != 0) 
+    {
+        printf("drmModeAddFB failed.\n");
+        // 娓呯悊锛氶攢姣� dumb buffer
+        struct drm_mode_destroy_dumb destroy = { .handle = handle };
+        drmIoctl(drm_fd, DRM_IOCTL_MODE_DESTROY_DUMB, &destroy);
+        close(drm_fd);
+        return 1;
+    }
+    printf("Framebuffer created: fb_id=%u\n", fb_id);
+
+
+    // ========== 2. 鍒濆鍖� GBM ==========
+    // 鍩轰簬 DRM 鏂囦欢鎻忚堪绗﹀垱寤轰竴涓� GBM 璁惧
+    struct gbm_device *gbm_dev = NULL;
+    gbm_dev = gbm_create_device(drm_fd);
+    if (NULL == gbm_dev)
+    {
+        printf(" Create GBM device failed.\r\n");
+        return 1;
+    }
+    printf(" Create GBM device success.\r\n");
+
+    // 鍒涘缓 GBM 琛ㄩ潰锛岀敤浜庡瓨鏀炬覆鏌撳唴瀹�
+    struct gbm_surface *gbm_surface = NULL;
+    gbm_surface = gbm_surface_create(gbm_dev, w,h,GBM_FORMAT_XRGB8888,GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING);
+    if (NULL == gbm_surface)
+    {
+        printf(" Create GBM surface failed.\r\n");
+        return 1;
+    }
+    printf(" Create GBM surface success.\r\n");
+    
+    // ========== 3. 鍒濆鍖� EGL ==========
+    // 鑾峰彇 EGL 鏄剧ず瀵硅薄锛堣繛鎺� GBM 璁惧锛�
+    // EGLDisplay egl_display = NULL;
+    egl_display = eglGetDisplay(gbm_dev);
+    if (NULL == egl_display)
+    {
+        printf(" Get display failed.\r\n");
+        return 1;
+    }
+    printf(" Get display success.\r\n");
+
+    eglInitialize(egl_display, NULL, NULL);
+
+
+    // // 閫夋嫨 EGL 閰嶇疆锛堝尮閰� GBM 琛ㄩ潰鐨勬牸寮忥級
+    // EGLConfig config;
+    // EGLint attribs[] = { EGL_SURFACE_TYPE, EGL_WINDOW_BIT, EGL_RED_SIZE, 8,
+    //                      EGL_GREEN_SIZE, 8, EGL_BLUE_SIZE, 8, EGL_NONE };
+    // eglChooseConfig(egl_display, attribs, &config, 1, NULL);
+    // // 鍒涘缓 EGL 绐楀彛琛ㄩ潰锛堝叧鑱� GBM 琛ㄩ潰锛�
+    // EGLSurface egl_surface = eglCreateWindowSurface(egl_display, config, gbm_surface, NULL);
+    // // 鍒涘缓 EGL 涓婁笅鏂�
+    // EGLContext egl_context = eglCreateContext(egl_display, config, EGL_NO_CONTEXT, NULL);
+    // eglMakeCurrent(egl_display, egl_surface, egl_surface, egl_context);
+
+    
+    // // ========== 4. 娓叉煋寰幆 ==========
+    // for (int frame = 0; frame < 300; frame++) {
+    //     // 4.1 娓呭睆骞剁粯鍒朵竴涓Щ鍔ㄧ殑涓夎褰紙OpenGL 閮ㄥ垎锛�
+    //     glClearColor(0.1f, 0.2f + frame*0.003f, 0.3f, 1.0f);
+    //     glClear(GL_COLOR_BUFFER_BIT);
+    //     // ... 浣犵殑 OpenGL 缁樺浘浠ｇ爜 ...
+        
+    //     // 4.2 浜ゆ崲缂撳啿鍖猴紙灏� OpenGL 缁樺埗缁撴灉鎻愪氦鍒� GBM 琛ㄩ潰锛�
+    //     eglSwapBuffers(egl_display, egl_surface);
+        
+    //     // 4.3 浠� GBM 琛ㄩ潰鑾峰彇涓�涓彲鏄剧ず鐨勭紦鍐插尯锛圙BM bo 瀵硅薄锛�
+    //     struct gbm_bo *bo = gbm_surface_lock_front_buffer(gbm_surface);
+    //     // 4.4 灏嗚繖涓� GBM 缂撳啿鍖烘彁浜ゅ埌 KMS 杩涜鏄剧ず
+    //     drmModeSetCrtc(drm_fd, resources->crtcs[0], fb_id, 0, 0,
+    //                    &connector->connector_id, 1, mode);
+    //     // 4.5 閲婃斁 GBM 缂撳啿鍖�
+    //     gbm_surface_release_buffer(gbm_surface, bo);
+    // }
+    
+    // ========== 5. 娓呯悊璧勬簮 ==========
+    // ... 鎸夌浉鍙嶉『搴忛攢姣� EGL 涓婁笅鏂囥�佽〃闈€�丟BM 璁惧銆佸叧闂� DRM fd 绛� ...
+    //return 0;
+
+#endif
+#if 0
+	eglNativeDisplayType = fbGetDisplayByIndex(0);
+	egl_display = eglGetDisplay(eglNativeDisplayType);
+
+	EGLint major, minor;
+	if(eglInitialize(egl_display, &major, &minor) == EGL_TRUE)
+    {
+        DBG_Log(DBG_INFO, "EGL initialize success, version %d.%d\n", major, minor);
+    }
+    else if(eglGetError() == EGL_BAD_DISPLAY)
+    {
+        DBG_Log(DBG_ERROR, "EGL initialize failure, [EGL_BAD_DISPLAY]\n");
+    }
+    else if(eglGetError() == EGL_NOT_INITIALIZED)
+    {
+        DBG_Log(DBG_ERROR, "EGL initialize failure, [EGL_NOT_INITIALIZED]\n");
+    }
+    else
+    {
+        DBG_Log(DBG_ERROR, "EGL initialize failure, [unknown error]\n");
+    }
+#endif
+	eglBindAPI(EGL_OPENGL_ES_API);
+
+
+	EGLint i, value;
+
+
+	eglChooseConfig(egl_display, egl_config_attribs, eglconfig, MAX_CFG_NUM, &numconfigs);
+	printf("Configurations:[%d]\n", numconfigs);
+	for(i = 0; i < numconfigs; i++)
+    {
+        printf("CFG[%3d]: ", i);
+        eglGetConfigAttrib(egl_display, eglconfig[i], EGL_RED_SIZE, &value);
+        printf("EGL_RED_SIZE[%2d] ", value);
+        eglGetConfigAttrib(egl_display, eglconfig[i], EGL_GREEN_SIZE, &value);
+        printf("EGL_GREEN_SIZE[%2d] ", value);
+        eglGetConfigAttrib(egl_display, eglconfig[i], EGL_BLUE_SIZE, &value);
+        printf("EGL_BLUE_SIZE[%2d] ", value);
+        eglGetConfigAttrib(egl_display, eglconfig[i], EGL_ALPHA_SIZE, &value);
+        printf("EGL_ALPHA_SIZE[%2d] ", value);
+        eglGetConfigAttrib(egl_display, eglconfig[i], EGL_BUFFER_SIZE, &value);
+        printf("EGL_BUFFER_SIZE[%2d] ", value);
+        eglGetConfigAttrib(egl_display, eglconfig[i], EGL_DEPTH_SIZE, &value);
+        printf("EGL_DEPTH_SIZE[%2d] ", value);
+        eglGetConfigAttrib(egl_display, eglconfig[i], EGL_SAMPLE_BUFFERS, &value);
+        printf("EGL_SAMPLE_BUFFERS[%2d] ", value);
+        eglGetConfigAttrib(egl_display, eglconfig[i], EGL_SAMPLES, &value);
+        printf("EGL_SAMPLES[%2d] ", value);
+        eglGetConfigAttrib(egl_display, eglconfig[i], EGL_STENCIL_SIZE, &value);
+        printf("EGL_STENCIL_SIZE[%2d] ", value);
+        eglGetConfigAttrib(egl_display, eglconfig[i], EGL_SURFACE_TYPE, &value);
+        printf("EGL_SURFACE_TYPE[%2d] ", value);
+        printf("\n");
+    }
+	assert(eglGetError() == EGL_SUCCESS);
+	assert(numconfigs != 0);
+	for(i = 0; i < numconfigs; i++)
+    {
+
+        eglGetConfigAttrib(egl_display, eglconfig[i], EGL_STENCIL_SIZE, &value);
+        if(value != 0)continue;
+        eglGetConfigAttrib(egl_display, eglconfig[i], EGL_SAMPLE_BUFFERS, &value);
+        if(value != 1)continue;
+        eglGetConfigAttrib(egl_display, eglconfig[i], EGL_SAMPLES, &value);
+        if(value != 4)continue;
+        eglGetConfigAttrib(egl_display, eglconfig[i], EGL_DEPTH_SIZE, &value);
+        if(value != 16)continue;
+
+        i++;
+        break;
+    }
+	assert(i != 0);
+	i--;
+	printf("Use Configuration:[%d]\n", i);
+    eglGetConfigAttrib(egl_display, eglconfig[i], EGL_RED_SIZE, &value);
+    printf("EGL_RED_SIZE[%2d] ", value);
+    eglGetConfigAttrib(egl_display, eglconfig[i], EGL_GREEN_SIZE, &value);
+    printf("EGL_GREEN_SIZE[%2d] ", value);
+    eglGetConfigAttrib(egl_display, eglconfig[i], EGL_BLUE_SIZE, &value);
+    printf("EGL_BLUE_SIZE[%2d] ", value);
+    eglGetConfigAttrib(egl_display, eglconfig[i], EGL_ALPHA_SIZE, &value);
+    printf("EGL_ALPHA_SIZE[%2d] ", value);
+    eglGetConfigAttrib(egl_display, eglconfig[i], EGL_BUFFER_SIZE, &value);
+    printf("EGL_BUFFER_SIZE[%2d] ", value);
+    eglGetConfigAttrib(egl_display, eglconfig[i], EGL_DEPTH_SIZE, &value);
+    printf("EGL_DEPTH_SIZE[%2d] ", value);
+    eglGetConfigAttrib(egl_display, eglconfig[i], EGL_SAMPLE_BUFFERS, &value);
+    printf("EGL_SAMPLE_BUFFERS[%2d] ", value);
+    eglGetConfigAttrib(egl_display, eglconfig[i], EGL_SAMPLES, &value);
+    printf("EGL_SAMPLES[%2d] ", value);
+    eglGetConfigAttrib(egl_display, eglconfig[i], EGL_STENCIL_SIZE, &value);
+    printf("EGL_STENCIL_SIZE[%2d] ", value);
+    eglGetConfigAttrib(egl_display, eglconfig[i], EGL_SURFACE_TYPE, &value);
+    printf("EGL_SURFACE_TYPE[%2d] ", value);
+    printf("\n");
+
+#if 0
+	eglNativeWindow = fbCreateWindow(eglNativeDisplayType, x, y, w, h);
+    
+	assert(eglNativeWindow);
+#endif // if 0
+  
+	eglsurface = eglCreateWindowSurface(egl_display, eglconfig[i], gbm_surface, NULL);
+
+
+
+    assert(eglGetError() == EGL_SUCCESS);
+	///指锟斤拷使锟斤拷OpenGL ES锟侥版本
+	EGLint ContextAttribList[] = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE };
+
+	eglcontext = eglCreateContext(egl_display, eglconfig[i], EGL_NO_CONTEXT, ContextAttribList);
+	assert(eglGetError() == EGL_SUCCESS);
+
+	eglMakeCurrent(egl_display, eglsurface, eglsurface, eglcontext);
+	assert(eglGetError() == EGL_SUCCESS);
+
+    
+    // ========== 4. 娓叉煋 ==========
+    //for (int frame = 0; frame < 300; frame++) {
+        // 4.1 娓呭睆骞剁粯鍒朵竴涓Щ鍔ㄧ殑涓夎褰紙OpenGL 閮ㄥ垎锛�
+        glClearColor(0.1f, 0.2f + 100*0.003f, 0.3f, 1.0f);
+        glClear(GL_COLOR_BUFFER_BIT);
+        // ... 浣犵殑 OpenGL 缁樺浘浠ｇ爜 ...
+        
+        // 4.2 浜ゆ崲缂撳啿鍖猴紙灏� OpenGL 缁樺埗缁撴灉鎻愪氦鍒� GBM 琛ㄩ潰锛�
+        eglSwapBuffers(egl_display, gbm_surface);
+        
+        // 4.3 浠� GBM 琛ㄩ潰鑾峰彇涓�涓彲鏄剧ず鐨勭紦鍐插尯锛圙BM bo 瀵硅薄锛�
+        struct gbm_bo *bo = gbm_surface_lock_front_buffer(gbm_surface);
+        // 4.4 灏嗚繖涓� GBM 缂撳啿鍖烘彁浜ゅ埌 KMS 杩涜鏄剧ず
+        int kms_ret = drmModeSetCrtc(drm_fd, resources->crtcs[0], fb_id, 0, 0,
+                       &connector->connector_id, 1, mode);
+        if (kms_ret < 0 )
+        {
+            printf("drmModeSetCrtc failed:(errno=%d)\r\n", errno);
+            return 1;
+        }
+        printf("drmModeSetCrtc success.\r\n");              
+        // 4.5 閲婃斁 GBM 缂撳啿鍖�
+        //gbm_surface_release_buffer(gbm_surface, bo);
+
+
+	///fb锟斤拷锟斤拷锟叫★拷锟斤拷锟紼GL锟斤拷始锟斤拷锟斤拷query锟斤拷取
+	if(rtw != NULL)
+	{
+	    eglQuerySurface(egl_display, gbm_surface, EGL_WIDTH, rtw);
+	    DBG_Log(DBG_INFO, "EGL_WIDTH:%d, width:%d\n", EGL_WIDTH, *rtw);
+	}
+	if(rth != NULL)
+    {
+        eglQuerySurface(egl_display, gbm_surface, EGL_HEIGHT, rth);
+	    DBG_Log(DBG_INFO, "EGL_HEIGHT:%d, width:%d\n", EGL_HEIGHT, *rth);
+    }
+
+
+    printf("InitGL end\n");
+	egl_init_flg = INS_TRUE;
+
+    return INS_TRUE;
+}
+
+#if 0 
+Bool InitGL_FB1(Int32 x, Int32 y, Int32 w, Int32 h, Int32 *rtw, Int32 *rth)
+{
+    #define MAX_CFG_NUM 100
+	EGLint numconfigs;
+	EGLConfig			 eglconfig[MAX_CFG_NUM];
+	EGLNativeWindowType  eglNativeWindow;
+	EGLNativeDisplayType eglNativeDisplayType;
+	EGLint i, value;
+#if 0 
+	eglNativeDisplayType = fbGetDisplayByIndex(1);
+	egl_display_1 = eglGetDisplay(eglNativeDisplayType);
+#endif // if 0
+
+
+    // ========== 1. 鍒濆鍖� DRM/KMS ==========
+    int drm_fd = open("/dev/dri/card0", O_RDWR);
+    if (drm_fd < 0) { perror("鎵撳紑 DRM 璁惧澶辫触"); return 1; }
+    // 鑾峰彇 DRM 璧勬簮锛堟樉绀鸿繛鎺ュ櫒銆佺紪鐮佸櫒绛夛級
+    drmModeRes *resources = drmModeGetResources(drm_fd);
+    // 鏌ユ壘绗竴涓凡杩炴帴鐨勬樉绀哄櫒锛圕onnector锛�
+    drmModeConnector *connector = NULL;
+    for (int i = 0; i < resources->count_connectors; i++) {
+        connector = drmModeGetConnector(drm_fd, resources->connectors[i]);
+        if (connector->connection == DRM_MODE_CONNECTED) {
+            break; // 鎵惧埌涓�涓凡杩炴帴鐨勬樉绀哄櫒
+        }
+        drmModeFreeConnector(connector);
+        connector = NULL;
+    }
+    if (!connector) { printf("鏈壘鍒板凡杩炴帴鐨勬樉绀哄櫒銆俓n"); return 1; }
+    // 鑾峰彇鏄剧ず鍣ㄧ殑绗竴涓彲鐢ㄥ垎杈ㄧ巼妯″紡锛圡ode锛�
+    drmModeModeInfo *mode = &connector->modes[0];
+    // 涓鸿繖涓樉绀哄櫒鍒涘缓涓�涓� Framebuffer锛堝唴鏍稿璞★紝涓嶆槸鏄惧瓨锛�
+    uint32_t fb_id;
+    drmModeAddFB(drm_fd, w, h, 24, 32,
+                 w*4, 0, &fb_id);
+    
+    // ========== 2. 鍒濆鍖� GBM ==========
+    // 鍩轰簬 DRM 鏂囦欢鎻忚堪绗﹀垱寤轰竴涓� GBM 璁惧
+    struct gbm_device *gbm_dev = gbm_create_device(drm_fd);
+    // 鍒涘缓 GBM 琛ㄩ潰锛岀敤浜庡瓨鏀炬覆鏌撳唴瀹�
+    struct gbm_surface *gbm_surface = gbm_surface_create(gbm_dev,
+                                                         mode->hdisplay,
+                                                         mode->vdisplay,
+                                                         GBM_FORMAT_XRGB8888,
+                                                         GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING);
+    
+    // ========== 3. 鍒濆鍖� EGL ==========
+    // 鑾峰彇 EGL 鏄剧ず瀵硅薄锛堣繛鎺� GBM 璁惧锛�
+    EGLDisplay egl_display_1 = eglGetDisplay(gbm_dev);
+    
+	EGLint major, minor;
+	if(eglInitialize(egl_display_1, &major, &minor) == EGL_TRUE)
+    {
+        DBG_Log(DBG_INFO, "EGL initialize success, version %d.%d\n", major, minor);
+    }
+    else if(eglGetError() == EGL_BAD_DISPLAY)
+    {
+        DBG_Log(DBG_ERROR, "EGL initialize failure, [EGL_BAD_DISPLAY]\n");
+    }
+    else if(eglGetError() == EGL_NOT_INITIALIZED)
+    {
+        DBG_Log(DBG_ERROR, "EGL initialize failure, [EGL_NOT_INITIALIZED]\n");
+    }
+    else
+    {
+        DBG_Log(DBG_ERROR, "EGL initialize failure, [unknown error]\n");
+    }
+    //assert(eglGetError() == EGL_SUCCESS);
+	///锟斤拷锟斤拷OpenGL ES Api
+	eglBindAPI(EGL_OPENGL_ES_API);
+
+	eglChooseConfig(egl_display_1, egl_config_attribs, eglconfig, MAX_CFG_NUM, &numconfigs);
+	assert(eglGetError() == EGL_SUCCESS);
+	assert(numconfigs != 0);
+
+	for(i = 0; i < numconfigs; i++)
+    {
+        eglGetConfigAttrib(egl_display_1, eglconfig[i], EGL_ALPHA_SIZE, &value);
+        if(value != 0)continue;
+        eglGetConfigAttrib(egl_display_1, eglconfig[i], EGL_BUFFER_SIZE, &value);
+        if(value != 24)continue;
+        eglGetConfigAttrib(egl_display_1, eglconfig[i], EGL_STENCIL_SIZE, &value);
+        if(value != 0)continue;
+        eglGetConfigAttrib(egl_display_1, eglconfig[i], EGL_SAMPLE_BUFFERS, &value);
+        if(value != 1)continue;
+        eglGetConfigAttrib(egl_display_1, eglconfig[i], EGL_SAMPLES, &value);
+        if(value != 4)continue;
+        eglGetConfigAttrib(egl_display_1, eglconfig[i], EGL_DEPTH_SIZE, &value);
+        if(value != 16)continue;
+
+        i++;
+        break;
+    }
+	assert(i != 0);
+	i = i-1;
+	printf("Use Configuration:[%d]\n", i);
+    eglGetConfigAttrib(egl_display_1, eglconfig[i], EGL_RED_SIZE, &value);
+    printf("EGL_RED_SIZE[%2d] ", value);
+    eglGetConfigAttrib(egl_display_1, eglconfig[i], EGL_GREEN_SIZE, &value);
+    printf("EGL_GREEN_SIZE[%2d] ", value);
+    eglGetConfigAttrib(egl_display_1, eglconfig[i], EGL_BLUE_SIZE, &value);
+    printf("EGL_BLUE_SIZE[%2d] ", value);
+    eglGetConfigAttrib(egl_display_1, eglconfig[i], EGL_ALPHA_SIZE, &value);
+    printf("EGL_ALPHA_SIZE[%2d] ", value);
+    eglGetConfigAttrib(egl_display_1, eglconfig[i], EGL_BUFFER_SIZE, &value);
+    printf("EGL_BUFFER_SIZE[%2d] ", value);
+    eglGetConfigAttrib(egl_display_1, eglconfig[i], EGL_DEPTH_SIZE, &value);
+    printf("EGL_DEPTH_SIZE[%2d] ", value);
+    eglGetConfigAttrib(egl_display_1, eglconfig[i], EGL_SAMPLE_BUFFERS, &value);
+    printf("EGL_SAMPLE_BUFFERS[%2d] ", value);
+    eglGetConfigAttrib(egl_display_1, eglconfig[i], EGL_SAMPLES, &value);
+    printf("EGL_SAMPLES[%2d] ", value);
+    eglGetConfigAttrib(egl_display_1, eglconfig[i], EGL_STENCIL_SIZE, &value);
+    printf("EGL_STENCIL_SIZE[%2d] ", value);
+    eglGetConfigAttrib(egl_display_1, eglconfig[i], EGL_SURFACE_TYPE, &value);
+    printf("EGL_SURFACE_TYPE[%2d] ", value);
+    printf("\n");
+#if 0
+	eglNativeWindow = fbCreateWindow(eglNativeDisplayType, x, y, w, h);
+	assert(eglNativeWindow);
+
+	eglsurface_fb1 = eglCreateWindowSurface(egl_display_1, eglconfig[i], eglNativeWindow, NULL);
+
+#endif
+    assert(eglGetError() == EGL_SUCCESS);s
+	///指锟斤拷使锟斤拷OpenGL ES锟侥版本
+	EGLint ContextAttribList[] = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE };
+
+	eglcontext_fb1 = eglCreateContext(egl_display_1, eglconfig[i], EGL_NO_CONTEXT, ContextAttribList);
+	assert(eglGetError() == EGL_SUCCESS);
+
+	eglMakeCurrent(egl_display_1, eglsurface_fb1, eglsurface_fb1, eglcontext_fb1);
+	assert(eglGetError() == EGL_SUCCESS);
+
+	///fb锟斤拷锟斤拷锟叫★拷锟斤拷锟紼GL锟斤拷始锟斤拷锟斤拷query锟斤拷取
+	if(rtw != NULL)
+	{
+	    eglQuerySurface(egl_display_1, eglsurface_fb1, EGL_WIDTH, rtw);
+	    DBG_Log(DBG_INFO, "EGL_WIDTH:%d, width:%d\n", EGL_WIDTH, *rtw);
+	}
+	if(rth != NULL)
+    {
+        eglQuerySurface(egl_display_1, eglsurface_fb1, EGL_HEIGHT, rth);
+	    DBG_Log(DBG_INFO, "EGL_HEIGHT:%d, width:%d\n", EGL_HEIGHT, *rth);
+    }
+
+	egl_init_flg_fb1 = INS_TRUE;
+    printf("InitGL_FB1 end\n");
+
+    return INS_TRUE;
+}
+#endif 
+Bool SwapGLBuffer_FB1()
+{
+    glFinish();
+    eglSwapBuffers(egl_display_1, eglsurface_fb1);
+    printf(" eglSwapBuffers1.\r\n");
+    return INS_TRUE;
+}
+
+void DeInitGL_FB1()
+{
+	if(egl_init_flg_fb1 == INS_FALSE)
+	{
+        glClearColor(0.0, 0.0, 0.0, 0.0);
+    	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+        eglSwapBuffers(egl_display_1, eglsurface_fb1);
+        printf(" eglSwapBuffers2.\r\n");
+		eglMakeCurrent(egl_display_1, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+		//assert(eglGetError() == EGL_SUCCESS);
+		eglDestroyContext(egl_display_1, eglcontext_fb1);
+		eglDestroySurface(egl_display_1, eglsurface_fb1);
+		eglTerminate(egl_display_1);
+		//assert(eglGetError() == EGL_SUCCESS);
+		eglReleaseThread();
+		egl_init_flg_fb1 = INS_TRUE;
+	}
+}
+
+#endif // COMPILE_IN_WINDOWS
+
+Bool SwapGLBuffer()
+{
+    glFinish();
+#ifdef COMPILE_IN_WINDOWS
+    SwapBuffers(mHDc);
+#else
+    eglSwapBuffers(egl_display, eglsurface);
+    //printf(" eglSwapBuffers3.\r\n");
+#endif // COMPILE_IN_WINDOWS
+    return INS_TRUE;
+}
+
+void DeInitGL()
+{
+#ifdef COMPILE_IN_WINDOWS
+    /* get the device context (DC) */
+    wglMakeCurrent(NULL, NULL);
+    wglDeleteContext(mHGlrc);
+    ReleaseDC(InsRenderHwnd, mHDc);
+#else
+	if(egl_init_flg == INS_FALSE)
+	{
+        glClearColor(0.0, 0.0, 0.0, 0.0);
+    	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+        eglSwapBuffers(egl_display, eglsurface);
+        printf(" eglSwapBuffers4.\r\n");
+		eglMakeCurrent(egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+		//assert(eglGetError() == EGL_SUCCESS);
+		eglDestroyContext(egl_display, eglcontext);
+		eglDestroySurface(egl_display, eglsurface);
+		eglTerminate(egl_display);
+		//assert(eglGetError() == EGL_SUCCESS);
+		eglReleaseThread();
+		egl_init_flg = INS_TRUE;
+	}
+#endif // COMPILE_IN_WINDOWS
+}
diff --git a/insDavi2.0/src/lib/InsJpeg.c b/clusterApp/src/lib/InsJpeg.c
similarity index 100%
rename from insDavi2.0/src/lib/InsJpeg.c
rename to clusterApp/src/lib/InsJpeg.c
diff --git a/insDavi2.0/src/lib/InsMatrix.c b/clusterApp/src/lib/InsMatrix.c
similarity index 100%
rename from insDavi2.0/src/lib/InsMatrix.c
rename to clusterApp/src/lib/InsMatrix.c
diff --git a/insDavi2.0/src/lib/InsPng.c b/clusterApp/src/lib/InsPng.c
similarity index 98%
rename from insDavi2.0/src/lib/InsPng.c
rename to clusterApp/src/lib/InsPng.c
index 5e045ff..b8d4ee5 100644
--- a/insDavi2.0/src/lib/InsPng.c
+++ b/clusterApp/src/lib/InsPng.c
@@ -7,8 +7,8 @@
 
 #include <zlib.h>
 #include <png.h>
-#include <pngstruct.h>
-#include <pnginfo.h>
+#include "pngstruct.h"
+#include "pnginfo.h"
 
 typedef struct Struct_MemPng
 {
diff --git a/insDavi2.0/src/lib/InsQueue.c b/clusterApp/src/lib/InsQueue.c
similarity index 100%
rename from insDavi2.0/src/lib/InsQueue.c
rename to clusterApp/src/lib/InsQueue.c
diff --git a/insDavi2.0/src/lib/libcjson_linux.a b/clusterApp/src/lib/libcjson_linux.a
similarity index 100%
rename from insDavi2.0/src/lib/libcjson_linux.a
rename to clusterApp/src/lib/libcjson_linux.a
diff --git a/insDavi2.0/src/lib/libcjson_win.dll.a b/clusterApp/src/lib/libcjson_win.dll.a
similarity index 100%
rename from insDavi2.0/src/lib/libcjson_win.dll.a
rename to clusterApp/src/lib/libcjson_win.dll.a
diff --git a/insDavi2.0/src/lib/libjpeg_win.a b/clusterApp/src/lib/libjpeg_win.a
similarity index 100%
rename from insDavi2.0/src/lib/libjpeg_win.a
rename to clusterApp/src/lib/libjpeg_win.a
diff --git a/insDavi2.0/src/lib/libpng16.dll.a b/clusterApp/src/lib/libpng16.dll.a
similarity index 100%
rename from insDavi2.0/src/lib/libpng16.dll.a
rename to clusterApp/src/lib/libpng16.dll.a
diff --git a/insDavi2.0/src/lib/libzlib.dll.a b/clusterApp/src/lib/libzlib.dll.a
similarity index 100%
rename from insDavi2.0/src/lib/libzlib.dll.a
rename to clusterApp/src/lib/libzlib.dll.a
diff --git a/insDavi2.0/ucs-2_BE_basic.txt b/clusterApp/ucs-2_BE_basic.txt
similarity index 100%
rename from insDavi2.0/ucs-2_BE_basic.txt
rename to clusterApp/ucs-2_BE_basic.txt
diff --git a/insDavi2.0/ucs-2_BE_hint_and_alarm.txt b/clusterApp/ucs-2_BE_hint_and_alarm.txt
similarity index 100%
rename from insDavi2.0/ucs-2_BE_hint_and_alarm.txt
rename to clusterApp/ucs-2_BE_hint_and_alarm.txt
diff --git a/insDavi2.0/version.h b/clusterApp/version.h
similarity index 100%
rename from insDavi2.0/version.h
rename to clusterApp/version.h
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/cdjpeg.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/cdjpeg.o
deleted file mode 100644
index 2eb7d75..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/cdjpeg.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/cjpeg.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/cjpeg.o
deleted file mode 100644
index 444d10c..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/cjpeg.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/djpeg.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/djpeg.o
deleted file mode 100644
index 41fc41f..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/djpeg.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jaricom.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jaricom.o
deleted file mode 100644
index ac4979d..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jaricom.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcapimin.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcapimin.o
deleted file mode 100644
index 745f175..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcapimin.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcapistd.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcapistd.o
deleted file mode 100644
index ebe6c9a..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcapistd.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcarith.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcarith.o
deleted file mode 100644
index 7bba02a..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcarith.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jccoefct.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jccoefct.o
deleted file mode 100644
index 16bd9c1..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jccoefct.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jccolor.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jccolor.o
deleted file mode 100644
index d38f5fc..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jccolor.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcdctmgr.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcdctmgr.o
deleted file mode 100644
index a368c90..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcdctmgr.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jchuff.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jchuff.o
deleted file mode 100644
index b94e965..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jchuff.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcinit.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcinit.o
deleted file mode 100644
index f520a9a..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcinit.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcmainct.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcmainct.o
deleted file mode 100644
index c2f1906..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcmainct.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcmarker.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcmarker.o
deleted file mode 100644
index f8d6e2f..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcmarker.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcmaster.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcmaster.o
deleted file mode 100644
index 7c7a270..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcmaster.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcomapi.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcomapi.o
deleted file mode 100644
index 6aaa7fb..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcomapi.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcparam.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcparam.o
deleted file mode 100644
index 9c2b88c..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcparam.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcprepct.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcprepct.o
deleted file mode 100644
index 33c0d17..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcprepct.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcsample.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcsample.o
deleted file mode 100644
index 28fe95e..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jcsample.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jctrans.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jctrans.o
deleted file mode 100644
index 5cbf7c8..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jctrans.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdapimin.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdapimin.o
deleted file mode 100644
index 499dedd..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdapimin.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdapistd.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdapistd.o
deleted file mode 100644
index e98254b..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdapistd.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdarith.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdarith.o
deleted file mode 100644
index 10d344c..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdarith.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdatadst.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdatadst.o
deleted file mode 100644
index b5a60cf..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdatadst.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdatasrc.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdatasrc.o
deleted file mode 100644
index 65f16ae..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdatasrc.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdcoefct.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdcoefct.o
deleted file mode 100644
index b685566..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdcoefct.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdcolor.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdcolor.o
deleted file mode 100644
index 8357e9e..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdcolor.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jddctmgr.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jddctmgr.o
deleted file mode 100644
index f7bfef5..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jddctmgr.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdhuff.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdhuff.o
deleted file mode 100644
index e5ed0e5..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdhuff.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdinput.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdinput.o
deleted file mode 100644
index 5b32cd5..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdinput.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdmainct.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdmainct.o
deleted file mode 100644
index 675aa40..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdmainct.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdmarker.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdmarker.o
deleted file mode 100644
index 1b2cfd7..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdmarker.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdmaster.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdmaster.o
deleted file mode 100644
index ab16468..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdmaster.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdmerge.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdmerge.o
deleted file mode 100644
index d8635a8..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdmerge.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdpostct.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdpostct.o
deleted file mode 100644
index a45f0b9..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdpostct.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdsample.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdsample.o
deleted file mode 100644
index 160a29b..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdsample.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdtrans.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdtrans.o
deleted file mode 100644
index e736f6e..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jdtrans.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jerror.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jerror.o
deleted file mode 100644
index 2761860..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jerror.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jfdctflt.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jfdctflt.o
deleted file mode 100644
index fc2b6e0..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jfdctflt.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jfdctfst.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jfdctfst.o
deleted file mode 100644
index 40453fc..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jfdctfst.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jfdctint.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jfdctint.o
deleted file mode 100644
index 491fce3..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jfdctint.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jidctflt.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jidctflt.o
deleted file mode 100644
index 05f919f..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jidctflt.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jidctfst.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jidctfst.o
deleted file mode 100644
index d3b632c..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jidctfst.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jidctint.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jidctint.o
deleted file mode 100644
index a54a4aa..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jidctint.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jmemmgr.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jmemmgr.o
deleted file mode 100644
index 53b9cc5..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jmemmgr.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jmemnobs.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jmemnobs.o
deleted file mode 100644
index 494a8bf..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jmemnobs.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jpegtran.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jpegtran.o
deleted file mode 100644
index de2a262..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jpegtran.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jquant1.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jquant1.o
deleted file mode 100644
index a4af724..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jquant1.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jquant2.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jquant2.o
deleted file mode 100644
index 4f5e474..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jquant2.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jutils.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jutils.o
deleted file mode 100644
index 113255d..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/jutils.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdbmp.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdbmp.o
deleted file mode 100644
index 6851648..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdbmp.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdcolmap.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdcolmap.o
deleted file mode 100644
index e916ed2..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdcolmap.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdgif.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdgif.o
deleted file mode 100644
index 3d61c5b..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdgif.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdjpgcom.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdjpgcom.o
deleted file mode 100644
index cf3ec80..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdjpgcom.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdppm.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdppm.o
deleted file mode 100644
index 81d7594..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdppm.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdrle.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdrle.o
deleted file mode 100644
index 5d2c618..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdrle.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdswitch.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdswitch.o
deleted file mode 100644
index f326c12..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdswitch.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdtarga.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdtarga.o
deleted file mode 100644
index 6f60582..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/rdtarga.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/transupp.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/transupp.o
deleted file mode 100644
index aa405f6..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/transupp.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/wrbmp.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/wrbmp.o
deleted file mode 100644
index 6fb0ad5..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/wrbmp.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/wrgif.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/wrgif.o
deleted file mode 100644
index 958c930..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/wrgif.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/wrjpgcom.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/wrjpgcom.o
deleted file mode 100644
index a263742..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/wrjpgcom.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/wrppm.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/wrppm.o
deleted file mode 100644
index d938037..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/wrppm.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/wrrle.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/wrrle.o
deleted file mode 100644
index 60759b5..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/wrrle.o and /dev/null differ
diff --git a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/wrtarga.o b/insDavi2.0/3psw/jpegsr9c/jpeg-9c/wrtarga.o
deleted file mode 100644
index d698a55..0000000
Binary files a/insDavi2.0/3psw/jpegsr9c/jpeg-9c/wrtarga.o and /dev/null differ
diff --git a/insDavi2.0/3psw/lpng1634/TODO b/insDavi2.0/3psw/lpng1634/TODO
deleted file mode 100644
index 36d6092..0000000
--- a/insDavi2.0/3psw/lpng1634/TODO
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-TODO - list of things to do for libpng:
-
-Final bug fixes.
-Better C++ wrapper/full C++ implementation?
-Fix problem with C++ and EXTERN "C".
-cHRM transformation.
-Remove setjmp/longjmp usage in favor of returning error codes. As a start on
-  this, minimize the use of png_error(), replacing them with
-  png_warning(); return(0); or similar.
-Palette creation.
-Add "grayscale->palette" transformation and "palette->grayscale" detection.
-Improved dithering.
-Multi-lingual error and warning message support.
-Complete sRGB transformation (presently it simply uses gamma=0.45455).
-Man pages for function calls.
-Better documentation.
-Better filter selection
-   (counting huffman bits/precompression?  filter inertia?  filter costs?).
-Histogram creation.
-Text conversion between different code pages (Latin-1 -> Mac and DOS).
-Avoid building gamma tables whenever possible.
-Use greater precision when changing to linear gamma for compositing against
-  background and doing rgb-to-gray transformation.
-Investigate pre-incremented loop counters and other loop constructions.
-Add interpolated method of handling interlacing.
-Extend pngvalid.c to validate more of the libpng transformations.
-Refactor preprocessor conditionals to compile entire statements
-
-*/
diff --git a/insDavi2.0/3psw/lpng1634/contrib/visupng/VisualPng.ico b/insDavi2.0/3psw/lpng1634/contrib/visupng/VisualPng.ico
deleted file mode 100644
index 68aa371..0000000
Binary files a/insDavi2.0/3psw/lpng1634/contrib/visupng/VisualPng.ico and /dev/null differ
diff --git a/insDavi2.0/3psw/lpng1634/projects/vstudio/README.txt b/insDavi2.0/3psw/lpng1634/projects/vstudio/README.txt
deleted file mode 100644
index 71d3ba2..0000000
--- a/insDavi2.0/3psw/lpng1634/projects/vstudio/README.txt
+++ /dev/null
@@ -1,97 +0,0 @@
-
-VisualStudio instructions
-
-libpng version 1.6.34 - September 29, 2017
-
-Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson
-
-This code is released under the libpng license.
-For conditions of distribution and use, see the disclaimer
-and license in png.h
-
-This directory  contains support for building libpng under MicroSoft
-VisualStudio 2010.  It may also work under later versions of VisualStudio.
-You should be familiar with VisualStudio before using this directory.
-
-Initial preparations
-====================
-You must enter some information in zlib.props before attempting to build
-with this 'solution'.  Please read and edit zlib.props first.  You will
-probably not be familiar with the contents of zlib.props - do not worry,
-it is mostly harmless.
-
-This is all you need to do to build the 'release' and 'release library'
-configurations.
-
-Debugging
-=========
-The release configurations default to /Ox optimization.  Full debugging
-information is produced (in the .pdb), but if you encounter a problem the
-optimization may make it difficult to debug.  Simply rebuild with a lower
-optimization level (e.g. /Od.)
-
-Linking your application
-========================
-Normally you should link against the 'release' configuration.  This builds a
-DLL for libpng with the default runtime options used by Visual Studio 2010.
-In particular the runtime library is the "MultiThreaded DLL" version.
-If you use Visual Studio defaults to build your application you will have no
-problems.
-
-If you don't use the Visual Studio defaults your application must still be
-built with the default runtime option (/MD).  If, for some reason, it is not
-then your application will crash inside libpng16.dll as soon as libpng
-tries to read from a file handle you pass in.
-
-If you do not want to use the DLL, for example for a very small application,
-the 'release library' configuration may be more appropriate.  This is built
-with a non-standard runtime library - the "MultiThreaded" version.  When you
-build your application it must be compiled with this option (/MT), otherwise
-it will not build (if you are lucky) or crash (if you are not.) See the
-WARNING file that is distributed along with this readme.txt.
-
-Stop reading here
-=================
-You have enough information to build a working application.
-
-Debug versions have limited support
-===================================
-This solution includes limited support for debug versions of libpng.  You
-do not need these unless your own solution itself uses debug builds (it is
-far more effective to debug on the release builds, there is no point building
-a special debug build unless you have heap corruption problems that you can't
-track down.)
-
-The debug build of libpng is minimally supported.  Support for debug builds of
-zlib is also minimal.  You really don't want to do this.
-
-WARNING
-=======
-Libpng 1.6.x does not use the default run-time library when building static
-library builds of libpng; instead of the shared DLL runtime it uses a static
-runtime.  If you need to change this make sure to change the setting on all the
-relevant projects:
-
-    libpng
-    zlib
-    all the test programs
-
-The runtime library settings for each build are as follows:
-
-               Release        Debug
-    DLL         /MD            /MDd
-    Library     /MT            /MTd
-
-NOTICE that libpng 1.5.x erroneously used /MD for Debug DLL builds; if you used
-the debug builds in your app and you changed your app to use /MD you will need
-to change it back to /MDd for libpng 1.6.0 and later.
-
-The Visual Studio 2010 defaults for a Win32 DLL or Static Library project are
-as follows:
-
-                     Release     Debug
-    DLL               /MD         /MDd
-    Static Library    /MD         /MDd
-
-Also, be sure to build libpng, zlib, and your project all for the same
-platform (e.g., 32-bit or 64-bit).
diff --git a/insDavi2.0/3psw/lpng1634/projects/vstudio/libpng/libpng.vcxproj b/insDavi2.0/3psw/lpng1634/projects/vstudio/libpng/libpng.vcxproj
deleted file mode 100644
index 9bfb718..0000000
--- a/insDavi2.0/3psw/lpng1634/projects/vstudio/libpng/libpng.vcxproj
+++ /dev/null
@@ -1,234 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug Library|Win32">
-      <Configuration>Debug Library</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release Library|Win32">
-      <Configuration>Release Library</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{D6973076-9317-4EF2-A0B8-B7A18AC0713E}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>libpng</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\zlib.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <CustomBuildBeforeTargets>
-    </CustomBuildBeforeTargets>
-    <TargetName>$(ProjectName)16</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <CustomBuildBeforeTargets />
-    <TargetName>$(ProjectName)16</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <CustomBuildBeforeTargets>
-    </CustomBuildBeforeTargets>
-    <TargetName>$(ProjectName)16</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <CustomBuildBeforeTargets />
-    <TargetName>$(ProjectName)16</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>$(WarningLevel)</WarningLevel>
-      <MinimalRebuild>false</MinimalRebuild>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointExceptions>false</FloatingPointExceptions>
-      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile>
-      <BrowseInformation>true</BrowseInformation>
-      <CompileAs>CompileAsC</CompileAs>
-      <StringPooling>true</StringPooling>
-      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
-      <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>zlib.lib</AdditionalDependencies>
-      <Version>16</Version>
-      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>$(WarningLevel)</WarningLevel>
-      <MinimalRebuild>false</MinimalRebuild>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Disabled</Optimization>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointExceptions>false</FloatingPointExceptions>
-      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile>
-      <BrowseInformation>true</BrowseInformation>
-      <CompileAs>CompileAsC</CompileAs>
-      <StringPooling>true</StringPooling>
-      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>$(WarningLevel)</WarningLevel>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <FloatingPointExceptions>false</FloatingPointExceptions>
-      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile>
-      <BrowseInformation>true</BrowseInformation>
-      <CompileAs>CompileAsC</CompileAs>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
-      <Optimization>Full</Optimization>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>zlib.lib</AdditionalDependencies>
-      <Version>16</Version>
-      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
-    <ClCompile>
-      <WarningLevel>$(WarningLevel)</WarningLevel>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <FloatingPointExceptions>false</FloatingPointExceptions>
-      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile>
-      <BrowseInformation>true</BrowseInformation>
-      <CompileAs>CompileAsC</CompileAs>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
-      <Optimization>Full</Optimization>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib>
-      <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\png.c">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\..\pngerror.c" />
-    <ClCompile Include="..\..\..\pngget.c" />
-    <ClCompile Include="..\..\..\pngmem.c" />
-    <ClCompile Include="..\..\..\pngpread.c" />
-    <ClCompile Include="..\..\..\pngread.c" />
-    <ClCompile Include="..\..\..\pngrio.c" />
-    <ClCompile Include="..\..\..\pngrtran.c" />
-    <ClCompile Include="..\..\..\pngrutil.c" />
-    <ClCompile Include="..\..\..\pngset.c" />
-    <ClCompile Include="..\..\..\pngtrans.c" />
-    <ClCompile Include="..\..\..\pngwio.c" />
-    <ClCompile Include="..\..\..\pngwrite.c" />
-    <ClCompile Include="..\..\..\pngwtran.c" />
-    <ClCompile Include="..\..\..\pngwutil.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\..\scripts\pngwin.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">true</ExcludedFromBuild>
-    </ResourceCompile>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/insDavi2.0/3psw/lpng1634/projects/vstudio/pnglibconf/pnglibconf.vcxproj b/insDavi2.0/3psw/lpng1634/projects/vstudio/pnglibconf/pnglibconf.vcxproj
deleted file mode 100644
index efcc440..0000000
--- a/insDavi2.0/3psw/lpng1634/projects/vstudio/pnglibconf/pnglibconf.vcxproj
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{EB33566E-DA7F-4D28-9077-88C0B7C77E35}</ProjectGuid>
-    <RootNamespace>pnglibconf</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\zlib.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <CustomBuildBeforeTargets>Build</CustomBuildBeforeTargets>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>$(WarningLevel)</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <CustomBuildStep>
-      <Command>copy ..\..\..\scripts\pnglibconf.h.prebuilt ..\..\..\pnglibconf.h</Command>
-    </CustomBuildStep>
-    <CustomBuildStep>
-      <Message>Generating pnglibconf.h</Message>
-    </CustomBuildStep>
-    <CustomBuildStep>
-      <Outputs>..\..\..\pnglibconf.h</Outputs>
-    </CustomBuildStep>
-    <CustomBuildStep>
-      <Inputs>..\..\..\scripts\pnglibconf.h.prebuilt</Inputs>
-    </CustomBuildStep>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/insDavi2.0/3psw/lpng1634/projects/vstudio/pngstest/pngstest.vcxproj b/insDavi2.0/3psw/lpng1634/projects/vstudio/pngstest/pngstest.vcxproj
deleted file mode 100644
index 21810e3..0000000
--- a/insDavi2.0/3psw/lpng1634/projects/vstudio/pngstest/pngstest.vcxproj
+++ /dev/null
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug Library|Win32">
-      <Configuration>Debug Library</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release Library|Win32">
-      <Configuration>Release Library</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{277AC57F-313B-4D06-B119-A3CDB672D2FF}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>pngstest</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\zlib.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <CustomBuildAfterTargets />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <CustomBuildAfterTargets />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <CustomBuildAfterTargets />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <CustomBuildAfterTargets />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>$(WarningLevel)</WarningLevel>
-      <MinimalRebuild>false</MinimalRebuild>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Disabled</Optimization>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <CompileAsManaged>false</CompileAsManaged>
-      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <StringPooling>true</StringPooling>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <BrowseInformation>true</BrowseInformation>
-      <FloatingPointExceptions>false</FloatingPointExceptions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libpng16.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
-    </Link>
-    <CustomBuildStep>
-      <Message>Executing libpng simplified API test program</Message>
-      <Command>"$(OutDir)pngstest.exe" --strict --log --touch "$(IntDir)pngstest.out" ../../../contrib/pngsuite/basn0g01.png ../../../contrib/pngsuite/basn0g02.png ../../../contrib/pngsuite/basn0g04.png ../../../contrib/pngsuite/basn0g08.png ../../../contrib/pngsuite/basn0g16.png ../../../contrib/pngsuite/basn2c08.png ../../../contrib/pngsuite/basn2c16.png ../../../contrib/pngsuite/basn3p01.png ../../../contrib/pngsuite/basn3p02.png ../../../contrib/pngsuite/basn3p04.png ../../../contrib/pngsuite/basn3p08.png ../../../contrib/pngsuite/basn4a08.png ../../../contrib/pngsuite/basn4a16.png ../../../contrib/pngsuite/basn6a08.png ../../../contrib/pngsuite/basn6a16.png ../../../contrib/pngsuite/ftbbn0g01.png ../../../contrib/pngsuite/ftbbn0g02.png ../../../contrib/pngsuite/ftbbn0g04.png ../../../contrib/pngsuite/ftbbn2c16.png ../../../contrib/pngsuite/ftbbn3p08.png ../../../contrib/pngsuite/ftbgn2c16.png ../../../contrib/pngsuite/ftbgn3p08.png ../../../contrib/pngsuite/ftbrn2c08.png ../../../contrib/pngsuite/ftbwn0g16.png ../../../contrib/pngsuite/ftbwn3p08.png ../../../contrib/pngsuite/ftbyn3p08.png ../../../contrib/pngsuite/ftp0n0g08.png ../../../contrib/pngsuite/ftp0n2c08.png ../../../contrib/pngsuite/ftp0n3p08.png ../../../contrib/pngsuite/ftp1n3p08.png</Command>
-      <Outputs>$(IntDir)pngstest.out</Outputs>
-      <Inputs>$(OutDir)pngstest.exe</Inputs>
-    </CustomBuildStep>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>$(WarningLevel)</WarningLevel>
-      <MinimalRebuild>false</MinimalRebuild>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Disabled</Optimization>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <CompileAsManaged>false</CompileAsManaged>
-      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <StringPooling>true</StringPooling>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <BrowseInformation>true</BrowseInformation>
-      <FloatingPointExceptions>false</FloatingPointExceptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
-    </Link>
-    <CustomBuildStep>
-      <Message>Executing libpng simplified API test program</Message>
-      <Command>"$(OutDir)pngstest.exe" --strict --log --touch "$(IntDir)pngstest.out" ../../../contrib/pngsuite/basn0g01.png ../../../contrib/pngsuite/basn0g02.png ../../../contrib/pngsuite/basn0g04.png ../../../contrib/pngsuite/basn0g08.png ../../../contrib/pngsuite/basn0g16.png ../../../contrib/pngsuite/basn2c08.png ../../../contrib/pngsuite/basn2c16.png ../../../contrib/pngsuite/basn3p01.png ../../../contrib/pngsuite/basn3p02.png ../../../contrib/pngsuite/basn3p04.png ../../../contrib/pngsuite/basn3p08.png ../../../contrib/pngsuite/basn4a08.png ../../../contrib/pngsuite/basn4a16.png ../../../contrib/pngsuite/basn6a08.png ../../../contrib/pngsuite/basn6a16.png ../../../contrib/pngsuite/ftbbn0g01.png ../../../contrib/pngsuite/ftbbn0g02.png ../../../contrib/pngsuite/ftbbn0g04.png ../../../contrib/pngsuite/ftbbn2c16.png ../../../contrib/pngsuite/ftbbn3p08.png ../../../contrib/pngsuite/ftbgn2c16.png ../../../contrib/pngsuite/ftbgn3p08.png ../../../contrib/pngsuite/ftbrn2c08.png ../../../contrib/pngsuite/ftbwn0g16.png ../../../contrib/pngsuite/ftbwn3p08.png ../../../contrib/pngsuite/ftbyn3p08.png ../../../contrib/pngsuite/ftp0n0g08.png ../../../contrib/pngsuite/ftp0n2c08.png ../../../contrib/pngsuite/ftp0n3p08.png ../../../contrib/pngsuite/ftp1n3p08.png</Command>
-      <Outputs>$(IntDir)pngstest.out</Outputs>
-      <Inputs>$(OutDir)pngstest.exe</Inputs>
-    </CustomBuildStep>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>$(WarningLevel)</WarningLevel>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Full</Optimization>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <CompileAsManaged>false</CompileAsManaged>
-      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BrowseInformation>true</BrowseInformation>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <FloatingPointExceptions>false</FloatingPointExceptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>libpng16.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-    </Link>
-    <CustomBuildStep>
-      <Message>Executing libpng simplified API test program</Message>
-      <Command>"$(OutDir)pngstest.exe" --strict --log --touch "$(IntDir)pngstest.out" ../../../contrib/pngsuite/basn0g01.png ../../../contrib/pngsuite/basn0g02.png ../../../contrib/pngsuite/basn0g04.png ../../../contrib/pngsuite/basn0g08.png ../../../contrib/pngsuite/basn0g16.png ../../../contrib/pngsuite/basn2c08.png ../../../contrib/pngsuite/basn2c16.png ../../../contrib/pngsuite/basn3p01.png ../../../contrib/pngsuite/basn3p02.png ../../../contrib/pngsuite/basn3p04.png ../../../contrib/pngsuite/basn3p08.png ../../../contrib/pngsuite/basn4a08.png ../../../contrib/pngsuite/basn4a16.png ../../../contrib/pngsuite/basn6a08.png ../../../contrib/pngsuite/basn6a16.png ../../../contrib/pngsuite/ftbbn0g01.png ../../../contrib/pngsuite/ftbbn0g02.png ../../../contrib/pngsuite/ftbbn0g04.png ../../../contrib/pngsuite/ftbbn2c16.png ../../../contrib/pngsuite/ftbbn3p08.png ../../../contrib/pngsuite/ftbgn2c16.png ../../../contrib/pngsuite/ftbgn3p08.png ../../../contrib/pngsuite/ftbrn2c08.png ../../../contrib/pngsuite/ftbwn0g16.png ../../../contrib/pngsuite/ftbwn3p08.png ../../../contrib/pngsuite/ftbyn3p08.png ../../../contrib/pngsuite/ftp0n0g08.png ../../../contrib/pngsuite/ftp0n2c08.png ../../../contrib/pngsuite/ftp0n3p08.png ../../../contrib/pngsuite/ftp1n3p08.png</Command>
-      <Outputs>$(IntDir)pngstest.out</Outputs>
-      <Inputs>$(OutDir)pngstest.exe</Inputs>
-    </CustomBuildStep>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
-    <ClCompile>
-      <WarningLevel>$(WarningLevel)</WarningLevel>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Full</Optimization>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <CompileAsManaged>false</CompileAsManaged>
-      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BrowseInformation>true</BrowseInformation>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <FloatingPointExceptions>false</FloatingPointExceptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-    </Link>
-    <CustomBuildStep>
-      <Message>Executing libpng simplified API test program</Message>
-      <Command>"$(OutDir)pngstest.exe" --strict --log --touch "$(IntDir)pngstest.out" ../../../contrib/pngsuite/basn0g01.png ../../../contrib/pngsuite/basn0g02.png ../../../contrib/pngsuite/basn0g04.png ../../../contrib/pngsuite/basn0g08.png ../../../contrib/pngsuite/basn0g16.png ../../../contrib/pngsuite/basn2c08.png ../../../contrib/pngsuite/basn2c16.png ../../../contrib/pngsuite/basn3p01.png ../../../contrib/pngsuite/basn3p02.png ../../../contrib/pngsuite/basn3p04.png ../../../contrib/pngsuite/basn3p08.png ../../../contrib/pngsuite/basn4a08.png ../../../contrib/pngsuite/basn4a16.png ../../../contrib/pngsuite/basn6a08.png ../../../contrib/pngsuite/basn6a16.png ../../../contrib/pngsuite/ftbbn0g01.png ../../../contrib/pngsuite/ftbbn0g02.png ../../../contrib/pngsuite/ftbbn0g04.png ../../../contrib/pngsuite/ftbbn2c16.png ../../../contrib/pngsuite/ftbbn3p08.png ../../../contrib/pngsuite/ftbgn2c16.png ../../../contrib/pngsuite/ftbgn3p08.png ../../../contrib/pngsuite/ftbrn2c08.png ../../../contrib/pngsuite/ftbwn0g16.png ../../../contrib/pngsuite/ftbwn3p08.png ../../../contrib/pngsuite/ftbyn3p08.png ../../../contrib/pngsuite/ftp0n0g08.png ../../../contrib/pngsuite/ftp0n2c08.png ../../../contrib/pngsuite/ftp0n3p08.png ../../../contrib/pngsuite/ftp1n3p08.png</Command>
-      <Outputs>$(IntDir)pngstest.out</Outputs>
-      <Inputs>$(OutDir)pngstest.exe</Inputs>
-    </CustomBuildStep>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\contrib\libtests\pngstest.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/insDavi2.0/3psw/lpng1634/projects/vstudio/pngtest/pngtest.vcxproj b/insDavi2.0/3psw/lpng1634/projects/vstudio/pngtest/pngtest.vcxproj
deleted file mode 100644
index f1df07d..0000000
--- a/insDavi2.0/3psw/lpng1634/projects/vstudio/pngtest/pngtest.vcxproj
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug Library|Win32">
-      <Configuration>Debug Library</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release Library|Win32">
-      <Configuration>Release Library</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{228BA965-50D5-42B2-8BCF-AFCC227E3C1D}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>pngtest</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\zlib.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <CustomBuildAfterTargets />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <CustomBuildAfterTargets />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <CustomBuildAfterTargets />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <CustomBuildAfterTargets />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>$(WarningLevel)</WarningLevel>
-      <MinimalRebuild>false</MinimalRebuild>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Disabled</Optimization>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <CompileAsManaged>false</CompileAsManaged>
-      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <StringPooling>true</StringPooling>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <BrowseInformation>true</BrowseInformation>
-      <FloatingPointExceptions>false</FloatingPointExceptions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libpng16.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
-    </Link>
-    <CustomBuildStep>
-      <Message>Executing PNG test program</Message>
-      <Command>"$(OutDir)pngtest.exe" ..\..\..\pngtest.png "$(IntDir)pngout.png"</Command>
-      <Outputs>$(IntDir)pngout.png</Outputs>
-      <Inputs>..\..\..\pngtest.png;$(OutDir)pngtest.exe</Inputs>
-    </CustomBuildStep>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>$(WarningLevel)</WarningLevel>
-      <MinimalRebuild>false</MinimalRebuild>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Disabled</Optimization>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <CompileAsManaged>false</CompileAsManaged>
-      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <StringPooling>true</StringPooling>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <BrowseInformation>true</BrowseInformation>
-      <FloatingPointExceptions>false</FloatingPointExceptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
-    </Link>
-    <CustomBuildStep>
-      <Message>Executing PNG test program</Message>
-      <Command>"$(OutDir)pngtest.exe" ..\..\..\pngtest.png "$(IntDir)pngout.png"</Command>
-      <Outputs>$(IntDir)pngout.png</Outputs>
-      <Inputs>..\..\..\pngtest.png;$(OutDir)pngtest.exe</Inputs>
-    </CustomBuildStep>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>$(WarningLevel)</WarningLevel>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Full</Optimization>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <CompileAsManaged>false</CompileAsManaged>
-      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BrowseInformation>true</BrowseInformation>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <FloatingPointExceptions>false</FloatingPointExceptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <AdditionalDependencies>libpng16.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
-    </Link>
-    <CustomBuildStep>
-      <Message>Executing PNG test program</Message>
-      <Command>"$(OutDir)pngtest.exe" ..\..\..\pngtest.png "$(IntDir)pngout.png"</Command>
-      <Outputs>$(IntDir)pngout.png</Outputs>
-      <Inputs>..\..\..\pngtest.png;$(OutDir)pngtest.exe</Inputs>
-    </CustomBuildStep>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
-    <ClCompile>
-      <WarningLevel>$(WarningLevel)</WarningLevel>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Full</Optimization>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <CompileAsManaged>false</CompileAsManaged>
-      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BrowseInformation>true</BrowseInformation>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <FloatingPointExceptions>false</FloatingPointExceptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
-    </Link>
-    <CustomBuildStep>
-      <Message>Executing PNG test program</Message>
-      <Command>$(OutDir)pngtest.exe ..\..\..\pngtest.png $(IntDir)pngout.png</Command>
-      <Command>"$(OutDir)pngtest.exe" ..\..\..\pngtest.png "$(IntDir)pngout.png"</Command>
-      <Outputs>$(IntDir)pngout.png</Outputs>
-      <Inputs>..\..\..\pngtest.png;$(OutDir)pngtest.exe</Inputs>
-    </CustomBuildStep>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\pngtest.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/insDavi2.0/3psw/lpng1634/projects/vstudio/pngunknown/pngunknown.vcxproj b/insDavi2.0/3psw/lpng1634/projects/vstudio/pngunknown/pngunknown.vcxproj
deleted file mode 100644
index 409d662..0000000
--- a/insDavi2.0/3psw/lpng1634/projects/vstudio/pngunknown/pngunknown.vcxproj
+++ /dev/null
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug Library|Win32">
-      <Configuration>Debug Library</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release Library|Win32">
-      <Configuration>Release Library</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C5D3156C-8C8C-4936-B35F-2B829BA36FEC}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>pngunknown</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\zlib.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <CustomBuildAfterTargets />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <CustomBuildAfterTargets />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <CustomBuildAfterTargets />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <CustomBuildAfterTargets />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>$(WarningLevel)</WarningLevel>
-      <MinimalRebuild>false</MinimalRebuild>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Disabled</Optimization>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <CompileAsManaged>false</CompileAsManaged>
-      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <StringPooling>true</StringPooling>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <BrowseInformation>true</BrowseInformation>
-      <FloatingPointExceptions>false</FloatingPointExceptions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libpng16.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
-    </Link>
-    <CustomBuildStep>
-      <Message>Executing PNG validation program</Message>
-      <Command>"$(OutDir)pngunknown.exe" --strict --default --touch "$(IntDir)pngunknown.out" ../../../pngtest.png</Command>
-      <Outputs>$(IntDir)pngunknown.out</Outputs>
-      <Inputs>$(OutDir)pngunknown.exe</Inputs>
-    </CustomBuildStep>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>$(WarningLevel)</WarningLevel>
-      <MinimalRebuild>false</MinimalRebuild>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Disabled</Optimization>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <CompileAsManaged>false</CompileAsManaged>
-      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <StringPooling>true</StringPooling>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <BrowseInformation>true</BrowseInformation>
-      <FloatingPointExceptions>false</FloatingPointExceptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
-    </Link>
-    <CustomBuildStep>
-      <Message>Executing PNG validation program</Message>
-      <Command>"$(OutDir)pngunknown.exe" --strict --default --touch "$(IntDir)pngunknown.out" ../../../pngtest.png</Command>
-      <Outputs>$(IntDir)pngunknown.out</Outputs>
-      <Inputs>$(OutDir)pngunknown.exe</Inputs>
-    </CustomBuildStep>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>$(WarningLevel)</WarningLevel>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Full</Optimization>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <CompileAsManaged>false</CompileAsManaged>
-      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BrowseInformation>true</BrowseInformation>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <FloatingPointExceptions>false</FloatingPointExceptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>libpng16.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-    </Link>
-    <CustomBuildStep>
-      <Message>Executing PNG validation program</Message>
-      <Command>"$(OutDir)pngunknown.exe" --strict --default --touch "$(IntDir)pngunknown.out" ../../../pngtest.png</Command>
-      <Outputs>$(IntDir)pngunknown.out</Outputs>
-      <Inputs>$(OutDir)pngunknown.exe</Inputs>
-    </CustomBuildStep>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
-    <ClCompile>
-      <WarningLevel>$(WarningLevel)</WarningLevel>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Full</Optimization>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <CompileAsManaged>false</CompileAsManaged>
-      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BrowseInformation>true</BrowseInformation>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <FloatingPointExceptions>false</FloatingPointExceptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-    </Link>
-    <CustomBuildStep>
-      <Message>Executing PNG validation program</Message>
-      <Command>"$(OutDir)pngunknown.exe" --strict --default --touch "$(IntDir)pngunknown.out" ../../../pngtest.png</Command>
-      <Outputs>$(IntDir)pngunknown.out</Outputs>
-      <Inputs>$(OutDir)pngunknown.exe</Inputs>
-    </CustomBuildStep>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\contrib\libtests\pngunknown.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/insDavi2.0/3psw/lpng1634/projects/vstudio/pngvalid/pngvalid.vcxproj b/insDavi2.0/3psw/lpng1634/projects/vstudio/pngvalid/pngvalid.vcxproj
deleted file mode 100644
index c117d29..0000000
--- a/insDavi2.0/3psw/lpng1634/projects/vstudio/pngvalid/pngvalid.vcxproj
+++ /dev/null
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug Library|Win32">
-      <Configuration>Debug Library</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release Library|Win32">
-      <Configuration>Release Library</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>pngvalid</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\zlib.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <CustomBuildAfterTargets />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <CustomBuildAfterTargets />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <CustomBuildAfterTargets />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <CustomBuildAfterTargets />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>$(WarningLevel)</WarningLevel>
-      <MinimalRebuild>false</MinimalRebuild>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Disabled</Optimization>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <CompileAsManaged>false</CompileAsManaged>
-      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <StringPooling>true</StringPooling>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <BrowseInformation>true</BrowseInformation>
-      <FloatingPointExceptions>false</FloatingPointExceptions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
-    </Link>
-    <CustomBuildStep>
-      <Message>Executing PNG validation program</Message>
-      <Command>"$(OutDir)pngvalid.exe" --touch "$(IntDir)pngvalid.out"</Command>
-      <Outputs>$(IntDir)pngvalid.out</Outputs>
-      <Inputs>$(OutDir)pngvalid.exe</Inputs>
-    </CustomBuildStep>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>$(WarningLevel)</WarningLevel>
-      <MinimalRebuild>false</MinimalRebuild>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Disabled</Optimization>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <CompileAsManaged>false</CompileAsManaged>
-      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <StringPooling>true</StringPooling>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <BrowseInformation>true</BrowseInformation>
-      <FloatingPointExceptions>false</FloatingPointExceptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
-    </Link>
-    <CustomBuildStep>
-      <Message>Executing PNG validation program</Message>
-      <Command>"$(OutDir)pngvalid.exe" --touch "$(IntDir)pngvalid.out"</Command>
-      <Outputs>$(IntDir)pngvalid.out</Outputs>
-      <Inputs>$(OutDir)pngvalid.exe</Inputs>
-    </CustomBuildStep>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>$(WarningLevel)</WarningLevel>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Full</Optimization>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <CompileAsManaged>false</CompileAsManaged>
-      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BrowseInformation>true</BrowseInformation>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <FloatingPointExceptions>false</FloatingPointExceptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-    </Link>
-    <CustomBuildStep>
-      <Message>Executing PNG validation program</Message>
-      <Command>"$(OutDir)pngvalid.exe" --touch "$(IntDir)pngvalid.out"</Command>
-      <Outputs>$(IntDir)pngvalid.out</Outputs>
-      <Inputs>$(OutDir)pngvalid.exe</Inputs>
-    </CustomBuildStep>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
-    <ClCompile>
-      <WarningLevel>$(WarningLevel)</WarningLevel>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Full</Optimization>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <CompileAsManaged>false</CompileAsManaged>
-      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BrowseInformation>true</BrowseInformation>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <FloatingPointExceptions>false</FloatingPointExceptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-    </Link>
-    <CustomBuildStep>
-      <Message>Executing PNG validation program</Message>
-      <Command>"$(OutDir)pngvalid.exe" --touch "$(IntDir)pngvalid.out"</Command>
-      <Outputs>$(IntDir)pngvalid.out</Outputs>
-      <Inputs>$(OutDir)pngvalid.exe</Inputs>
-    </CustomBuildStep>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\contrib\libtests\pngvalid.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/insDavi2.0/3psw/lpng1634/projects/vstudio/vstudio.sln b/insDavi2.0/3psw/lpng1634/projects/vstudio/vstudio.sln
deleted file mode 100644
index af0b1ba..0000000
--- a/insDavi2.0/3psw/lpng1634/projects/vstudio/vstudio.sln
+++ /dev/null
@@ -1,109 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib\zlib.vcxproj", "{60F89955-91C6-3A36-8000-13C592FEC2DF}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pnglibconf", "pnglibconf\pnglibconf.vcxproj", "{EB33566E-DA7F-4D28-9077-88C0B7C77E35}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "libpng\libpng.vcxproj", "{D6973076-9317-4EF2-A0B8-B7A18AC0713E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{60F89955-91C6-3A36-8000-13C592FEC2DF} = {60F89955-91C6-3A36-8000-13C592FEC2DF}
-		{EB33566E-DA7F-4D28-9077-88C0B7C77E35} = {EB33566E-DA7F-4D28-9077-88C0B7C77E35}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pngtest", "pngtest\pngtest.vcxproj", "{228BA965-50D5-42B2-8BCF-AFCC227E3C1D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{60F89955-91C6-3A36-8000-13C592FEC2DF} = {60F89955-91C6-3A36-8000-13C592FEC2DF}
-		{EB33566E-DA7F-4D28-9077-88C0B7C77E35} = {EB33566E-DA7F-4D28-9077-88C0B7C77E35}
-		{D6973076-9317-4EF2-A0B8-B7A18AC0713E} = {D6973076-9317-4EF2-A0B8-B7A18AC0713E}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pngvalid", "pngvalid\pngvalid.vcxproj", "{9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{60F89955-91C6-3A36-8000-13C592FEC2DF} = {60F89955-91C6-3A36-8000-13C592FEC2DF}
-		{EB33566E-DA7F-4D28-9077-88C0B7C77E35} = {EB33566E-DA7F-4D28-9077-88C0B7C77E35}
-		{D6973076-9317-4EF2-A0B8-B7A18AC0713E} = {D6973076-9317-4EF2-A0B8-B7A18AC0713E}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pngstest", "pngstest\pngstest.vcxproj", "{277AC57F-313B-4D06-B119-A3CDB672D2FF}"
-	ProjectSection(ProjectDependencies) = postProject
-		{60F89955-91C6-3A36-8000-13C592FEC2DF} = {60F89955-91C6-3A36-8000-13C592FEC2DF}
-		{EB33566E-DA7F-4D28-9077-88C0B7C77E35} = {EB33566E-DA7F-4D28-9077-88C0B7C77E35}
-		{D6973076-9317-4EF2-A0B8-B7A18AC0713E} = {D6973076-9317-4EF2-A0B8-B7A18AC0713E}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pngunknown", "pngunknown\pngunknown.vcxproj", "{C5D3156C-8C8C-4936-B35F-2B829BA36FEC}"
-	ProjectSection(ProjectDependencies) = postProject
-		{60F89955-91C6-3A36-8000-13C592FEC2DF} = {60F89955-91C6-3A36-8000-13C592FEC2DF}
-		{EB33566E-DA7F-4D28-9077-88C0B7C77E35} = {EB33566E-DA7F-4D28-9077-88C0B7C77E35}
-		{D6973076-9317-4EF2-A0B8-B7A18AC0713E} = {D6973076-9317-4EF2-A0B8-B7A18AC0713E}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug Library|Win32 = Debug Library|Win32
-		Debug|Win32 = Debug|Win32
-		Release Library|Win32 = Release Library|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug Library|Win32.ActiveCfg = Debug Library|Win32
-		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug Library|Win32.Build.0 = Debug Library|Win32
-		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|Win32.Build.0 = Debug|Win32
-		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release Library|Win32.ActiveCfg = Release Library|Win32
-		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release Library|Win32.Build.0 = Release Library|Win32
-		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|Win32.ActiveCfg = Release|Win32
-		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|Win32.Build.0 = Release|Win32
-		{228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Debug Library|Win32.ActiveCfg = Debug Library|Win32
-		{228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Debug Library|Win32.Build.0 = Debug Library|Win32
-		{228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Debug|Win32.Build.0 = Debug|Win32
-		{228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Release Library|Win32.ActiveCfg = Release Library|Win32
-		{228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Release Library|Win32.Build.0 = Release Library|Win32
-		{228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Release|Win32.ActiveCfg = Release|Win32
-		{228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Release|Win32.Build.0 = Release|Win32
-		{60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug Library|Win32.ActiveCfg = Debug Library|Win32
-		{60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug Library|Win32.Build.0 = Debug Library|Win32
-		{60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|Win32.Build.0 = Debug|Win32
-		{60F89955-91C6-3A36-8000-13C592FEC2DF}.Release Library|Win32.ActiveCfg = Release Library|Win32
-		{60F89955-91C6-3A36-8000-13C592FEC2DF}.Release Library|Win32.Build.0 = Release Library|Win32
-		{60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|Win32.ActiveCfg = Release|Win32
-		{60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|Win32.Build.0 = Release|Win32
-		{9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Debug Library|Win32.ActiveCfg = Debug Library|Win32
-		{9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Debug Library|Win32.Build.0 = Debug Library|Win32
-		{9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Debug|Win32.Build.0 = Debug|Win32
-		{9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Release Library|Win32.ActiveCfg = Release Library|Win32
-		{9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Release Library|Win32.Build.0 = Release Library|Win32
-		{9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Release|Win32.ActiveCfg = Release|Win32
-		{9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Release|Win32.Build.0 = Release|Win32
-		{EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug Library|Win32.ActiveCfg = Release|Win32
-		{EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug Library|Win32.Build.0 = Release|Win32
-		{EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug|Win32.ActiveCfg = Release|Win32
-		{EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug|Win32.Build.0 = Release|Win32
-		{EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release Library|Win32.ActiveCfg = Release|Win32
-		{EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release Library|Win32.Build.0 = Release|Win32
-		{EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release|Win32.ActiveCfg = Release|Win32
-		{EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release|Win32.Build.0 = Release|Win32
-		{277AC57F-313B-4D06-B119-A3CDB672D2FF}.Debug Library|Win32.ActiveCfg = Debug Library|Win32
-		{277AC57F-313B-4D06-B119-A3CDB672D2FF}.Debug Library|Win32.Build.0 = Debug Library|Win32
-		{277AC57F-313B-4D06-B119-A3CDB672D2FF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{277AC57F-313B-4D06-B119-A3CDB672D2FF}.Debug|Win32.Build.0 = Debug|Win32
-		{277AC57F-313B-4D06-B119-A3CDB672D2FF}.Release Library|Win32.ActiveCfg = Release Library|Win32
-		{277AC57F-313B-4D06-B119-A3CDB672D2FF}.Release Library|Win32.Build.0 = Release Library|Win32
-		{277AC57F-313B-4D06-B119-A3CDB672D2FF}.Release|Win32.ActiveCfg = Release|Win32
-		{277AC57F-313B-4D06-B119-A3CDB672D2FF}.Release|Win32.Build.0 = Release|Win32
-		{C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Debug Library|Win32.ActiveCfg = Debug Library|Win32
-		{C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Debug Library|Win32.Build.0 = Debug Library|Win32
-		{C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Debug|Win32.Build.0 = Debug|Win32
-		{C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Release Library|Win32.ActiveCfg = Release Library|Win32
-		{C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Release Library|Win32.Build.0 = Release Library|Win32
-		{C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Release|Win32.ActiveCfg = Release|Win32
-		{C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/insDavi2.0/3psw/lpng1634/projects/vstudio/zlib.props b/insDavi2.0/3psw/lpng1634/projects/vstudio/zlib.props
deleted file mode 100644
index 8e3682a..0000000
--- a/insDavi2.0/3psw/lpng1634/projects/vstudio/zlib.props
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * zlib.props - location of zlib source
- *
- * libpng version 1.6.34 - September 29, 2017
- *
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
-
- * You must edit this file to record the location of the zlib
- * source code.
- -->
-
-<Project ToolsVersion="4.0"
-   xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <!-- Place the name of the directory containing the source of zlib used for
-	 debugging in this property.
-
-         The directory need only contain the '.c' and '.h' files from the
-	 source.
-
-	 If you use a relative directory name (as below) then it must be
-	 relative to the project directories; these are one level deeper than
-	 the directories containing this file.
-
-	 If the version of zlib you use does not match that used when the
-	 distribution was built you will get warnings from pngtest that the zlib
-	 versions do not match.  The zlib version used in this build is recorded
-	 below:
-     -->
-    <ZLibSrcDir>..\..\..\..\zlib-1.2.8</ZLibSrcDir>
-
-    <!-- The following line allows compilation for an ARM target with Visual
-         Studio 2012.  Notice that this is not supported by the Visual Studio
-         2012 IDE and that the programs that result cannot be run unless they
-         signed by Microsoft.  This is therefore untested; only Microsoft can
-         test it:
-     -->
-    <WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
-
-    <!-- The following lines provide a global (solution level) control of the
-         warnings issued by the compiler, these are used in the individual
-         project files (*/*.vcxproj) with, for zlib, some extra disables.
-
-         Different versions of Visual Studio may require different settings,
-         these settings work with Visual Studio 2013.  Just set
-         TreatWarningAsError to false to check the build without failing on
-         errors.
-     -->
-   <WarningLevel>EnableAllWarnings</WarningLevel>
-   <TreatWarningAsError>true</TreatWarningAsError>
-   <DisableSpecificWarnings>4255;4668;4710;4711;4746;4820;4996</DisableSpecificWarnings>
-  </PropertyGroup>
-</Project>
diff --git a/insDavi2.0/3psw/lpng1634/projects/vstudio/zlib/zlib.vcxproj b/insDavi2.0/3psw/lpng1634/projects/vstudio/zlib/zlib.vcxproj
deleted file mode 100644
index 0df16db..0000000
--- a/insDavi2.0/3psw/lpng1634/projects/vstudio/zlib/zlib.vcxproj
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug Library|Win32">
-      <Configuration>Debug Library</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release Library|Win32">
-      <Configuration>Release Library</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="$(ZLibSrcDir)\adler32.c" />
-    <ClCompile Include="$(ZLibSrcDir)\compress.c" />
-    <ClCompile Include="$(ZLibSrcDir)\crc32.c" />
-    <ClCompile Include="$(ZLibSrcDir)\deflate.c" />
-    <ClCompile Include="$(ZLibSrcDir)\infback.c" />
-    <ClCompile Include="$(ZLibSrcDir)\inffast.c" />
-    <ClCompile Include="$(ZLibSrcDir)\inflate.c" />
-    <ClCompile Include="$(ZLibSrcDir)\inftrees.c" />
-    <ClCompile Include="$(ZLibSrcDir)\trees.c" />
-    <ClCompile Include="$(ZLibSrcDir)\uncompr.c" />
-    <ClCompile Include="$(ZLibSrcDir)\zutil.c" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{60F89955-91C6-3A36-8000-13C592FEC2DF}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>zlib</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\zlib.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <WarningLevel>$(WarningLevel)</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Disabled</Optimization>
-      <BrowseInformation>true</BrowseInformation>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <DisableSpecificWarnings>$(DisableSpecificWarnings);4127;4131;4242;4244</DisableSpecificWarnings>
-      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
-    </ClCompile>
-    <Link>
-      <TargetMachine>MachineX86</TargetMachine>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>$(WarningLevel)</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Disabled</Optimization>
-      <BrowseInformation>true</BrowseInformation>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <DisableSpecificWarnings>$(DisableSpecificWarnings);4127;4131;4242;4244</DisableSpecificWarnings>
-      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <TargetMachine>MachineX86</TargetMachine>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
-    <ClCompile>
-      <WarningLevel>$(WarningLevel)</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Full</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <BrowseInformation>true</BrowseInformation>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <DisableSpecificWarnings>$(DisableSpecificWarnings);4127;4131;4242;4244</DisableSpecificWarnings>
-      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <TargetMachine>MachineX86</TargetMachine>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-    <Lib>
-      <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>$(WarningLevel)</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Full</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <BrowseInformation>true</BrowseInformation>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <DisableSpecificWarnings>$(DisableSpecificWarnings);4127;4131;4242;4244</DisableSpecificWarnings>
-      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <TargetMachine>MachineX86</TargetMachine>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib>
-      <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
-    </Lib>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/insDavi2.0/3psw/lpng1634/scripts/makefile.sco b/insDavi2.0/3psw/lpng1634/scripts/makefile.sco
deleted file mode 100644
index 67d84aa..0000000
--- a/insDavi2.0/3psw/lpng1634/scripts/makefile.sco
+++ /dev/null
@@ -1,226 +0,0 @@
-# makefile for SCO OSr5  ELF and Unixware 7 with Native cc
-# Contributed by Mike Hopkirk (hops at sco.com) modified from Makefile.lnx
-#   force ELF build dynamic linking, SONAME setting in lib and RPATH in app
-# Copyright (C) 2002, 2006, 2010-2014 Glenn Randers-Pehrson
-# Copyright (C) 1998 Greg Roelofs
-# Copyright (C) 1996, 1997 Andreas Dilger
-#
-# This code is released under the libpng license.
-# For conditions of distribution and use, see the disclaimer
-# and license in png.h
-
-# Library name:
-LIBNAME = libpng16
-PNGMAJ = 16
-
-# Shared library names:
-LIBSO=$(LIBNAME).so
-LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
-LIBSOREL=$(LIBSOMAJ).$(RELEASE)
-OLDSO=libpng.so
-
-# Utilities:
-CC=cc
-AR_RC=ar rc
-MKDIR_P=mkdir
-LN_SF=ln -f -s
-RANLIB=echo
-CP=cp
-RM_F=/bin/rm -f
-
-# where make install puts libpng.a, $(OLDSO)*, and png.h
-prefix=/usr/local
-exec_prefix=$(prefix)
-
-# Where the zlib library and include files are located
-#ZLIBLIB=/usr/local/lib
-#ZLIBINC=/usr/local/include
-ZLIBLIB=../zlib
-ZLIBINC=../zlib
-
-CPPFLAGS=-I$(ZLIBINC)
-CFLAGS= -dy -belf -O3
-LDFLAGS=-L. -L$(ZLIBLIB) -lpng16 -lz -lm
-
-INCPATH=$(prefix)/include
-LIBPATH=$(exec_prefix)/lib
-MANPATH=$(prefix)/man
-BINPATH=$(exec_prefix)/bin
-
-# override DESTDIR= on the make install command line to easily support
-# installing into a temporary location.  Example:
-#
-#    make install DESTDIR=/tmp/build/libpng
-#
-# If you're going to install into a temporary location
-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
-# you execute make install.
-DESTDIR=
-
-DB=$(DESTDIR)$(BINPATH)
-DI=$(DESTDIR)$(INCPATH)
-DL=$(DESTDIR)$(LIBPATH)
-DM=$(DESTDIR)$(MANPATH)
-
-# Pre-built configuration
-# See scripts/pnglibconf.mak for more options
-PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
-
-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
-	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
-	pngwtran.o pngmem.o pngerror.o pngpread.o
-
-OBJSDLL = $(OBJS:.o=.pic.o)
-
-.SUFFIXES:      .c .o .pic.o
-
-.c.o:
-	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
-
-.c.pic.o:
-	$(CC) -c $(CPPFLAGS) $(CFLAGS) -KPIC -o $@ $*.c
-
-all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
-
-pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
-	$(CP) $(PNGLIBCONF_H_PREBUILT) $@
-
-libpng.a: $(OBJS)
-	$(AR_RC) $@ $(OBJS)
-	$(RANLIB) $@
-
-libpng.pc:
-	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
-	-e s!@exec_prefix@!$(exec_prefix)! \
-	-e s!@libdir@!$(LIBPATH)! \
-	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc
-
-libpng-config:
-	( cat scripts/libpng-config-head.in; \
-	echo prefix=\"$(prefix)\"; \
-	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
-	echo ccopts=\"-belf\"; \
-	echo L_opts=\"-L$(LIBPATH)\"; \
-	echo libs=\"-lpng16 -lz -lm\"; \
-	cat scripts/libpng-config-body.in ) > libpng-config
-	chmod +x libpng-config
-
-$(LIBSO): $(LIBSOMAJ)
-	$(LN_SF) $(LIBSOMAJ) $(LIBSO)
-
-$(LIBSOMAJ): $(OBJSDLL)
-	$(CC) -G  -Wl,-h,$(LIBSOMAJ) -o $(LIBSOMAJ) \
-	 $(OBJSDLL)
-
-pngtest: pngtest.o $(LIBSO)
-	LD_RUN_PATH=.:$(ZLIBLIB) $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
-
-test: pngtest
-	./pngtest
-
-install-headers: png.h pngconf.h pnglibconf.h
-	-@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
-	-@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
-	-@$(RM_F) $(DI)/png.h
-	-@$(RM_F) $(DI)/pngconf.h
-	-@$(RM_F) $(DI)/pnglibconf.h
-	cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
-	chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h
-	-@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h
-	-@$(RM_F) $(DI)/libpng
-	(cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
-
-install-static: install-headers libpng.a
-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
-	cp libpng.a $(DL)/$(LIBNAME).a
-	chmod 644 $(DL)/$(LIBNAME).a
-	-@$(RM_F) $(DL)/libpng.a
-	(cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
-
-install-shared: install-headers $(LIBSOMAJ) libpng.pc
-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
-	-@$(RM_F) $(DL)/$(LIBSO)
-	-@$(RM_F) $(DL)/$(LIBSOREL)
-	-@$(RM_F) $(DL)/$(OLDSO)
-	cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
-	chmod 755 $(DL)/$(LIBSOREL)
-	(cd $(DL); \
-	$(LN_SF) $(LIBSOREL) $(LIBSO); \
-	$(LN_SF) $(LIBSO) $(OLDSO))
-	-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
-	-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
-	-@$(RM_F) $(DL)/pkgconfig/libpng.pc
-	cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
-	chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
-	(cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
-
-install-man: libpng.3 libpngpf.3 png.5
-	-@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
-	-@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
-	-@$(RM_F) $(DM)/man3/libpng.3
-	-@$(RM_F) $(DM)/man3/libpngpf.3
-	cp libpng.3 $(DM)/man3
-	cp libpngpf.3 $(DM)/man3
-	-@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
-	-@$(RM_F) $(DM)/man5/png.5
-	cp png.5 $(DM)/man5
-
-install-config: libpng-config
-	-@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
-	-@$(RM_F) $(DB)/libpng-config
-	-@$(RM_F) $(DB)/$(LIBNAME)-config
-	cp libpng-config $(DB)/$(LIBNAME)-config
-	chmod 755 $(DB)/$(LIBNAME)-config
-	(cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
-
-install: install-static install-shared install-man install-config
-
-# If you installed in $(DESTDIR), test-installed won't work until you
-# move the library to its final location.  Use test-dd to test it
-# before then.
-
-test-dd:
-	echo
-	echo Testing installed dynamic shared library in $(DL).
-	$(CC) -I$(DI) $(CPPFLAGS) \
-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
-	   -L$(DL) -L$(ZLIBLIB) \
-	   -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
-	./pngtestd pngtest.png
-
-test-installed:
-	$(CC) $(CPPFLAGS) $(CFLAGS) \
-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
-	   -L$(ZLIBLIB) \
-	   -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`
-	./pngtesti pngtest.png
-
-clean:
-	$(RM_F) *.o libpng.a pngtest pngout.png libpng-config \
-	$(LIBSO) $(LIBSOMAJ)* pngtest-static pngtesti \
-	pnglibconf.h libpng.pc
-
-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
-writelock:
-	chmod a-w *.[ch35] $(DOCS) scripts/*
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-
-pngtest.o: png.h pngconf.h pnglibconf.h
diff --git a/insDavi2.0/3psw/zlib-1.2.11/adler32.o b/insDavi2.0/3psw/zlib-1.2.11/adler32.o
deleted file mode 100644
index a1d2900..0000000
Binary files a/insDavi2.0/3psw/zlib-1.2.11/adler32.o and /dev/null differ
diff --git a/insDavi2.0/3psw/zlib-1.2.11/compress.o b/insDavi2.0/3psw/zlib-1.2.11/compress.o
deleted file mode 100644
index 4e7256a..0000000
Binary files a/insDavi2.0/3psw/zlib-1.2.11/compress.o and /dev/null differ
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/iostream3/TODO b/insDavi2.0/3psw/zlib-1.2.11/contrib/iostream3/TODO
deleted file mode 100644
index 7032f97..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/iostream3/TODO
+++ /dev/null
@@ -1,17 +0,0 @@
-Possible upgrades to gzfilebuf:
-
-- The ability to do putback (e.g. putbackfail)
-
-- The ability to seek (zlib supports this, but could be slow/tricky)
-
-- Simultaneous read/write access (does it make sense?)
-
-- Support for ios_base::ate open mode
-
-- Locale support?
-
-- Check public interface to see which calls give problems
-  (due to dependence on library internals)
-
-- Override operator<<(ostream&, gzfilebuf*) to allow direct copying
-  of stream buffer to stream ( i.e. os << is.rdbuf(); )
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/readme.txt b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/readme.txt
deleted file mode 100644
index 48cccc0..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/readme.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-Building instructions for the DLL versions of Zlib 1.2.11
-========================================================
-
-This directory contains projects that build zlib and minizip using
-Microsoft Visual C++ 9.0/10.0.
-
-You don't need to build these projects yourself. You can download the
-binaries from:
-  http://www.winimage.com/zLibDll
-
-More information can be found at this site.
-
-
-
-
-
-Build instructions for Visual Studio 2008 (32 bits or 64 bits)
---------------------------------------------------------------
-- Decompress current zlib, including all contrib/* files
-- Compile assembly code (with Visual Studio Command Prompt) by running:
-   bld_ml64.bat (in contrib\masmx64)
-   bld_ml32.bat (in contrib\masmx86)
-- Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008
-- Or run: vcbuild /rebuild contrib\vstudio\vc9\zlibvc.sln "Release|Win32"
-
-Build instructions for Visual Studio 2010 (32 bits or 64 bits)
---------------------------------------------------------------
-- Decompress current zlib, including all contrib/* files
-- Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010
-
-Build instructions for Visual Studio 2012 (32 bits or 64 bits)
---------------------------------------------------------------
-- Decompress current zlib, including all contrib/* files
-- Open contrib\vstudio\vc11\zlibvc.sln with Microsoft Visual C++ 2012
-
-Build instructions for Visual Studio 2013 (32 bits or 64 bits)
---------------------------------------------------------------
-- Decompress current zlib, including all contrib/* files
-- Open contrib\vstudio\vc12\zlibvc.sln with Microsoft Visual C++ 2013
-
-Build instructions for Visual Studio 2015 (32 bits or 64 bits)
---------------------------------------------------------------
-- Decompress current zlib, including all contrib/* files
-- Open contrib\vstudio\vc14\zlibvc.sln with Microsoft Visual C++ 2015
-
-
-Important
----------
-- To use zlibwapi.dll in your application, you must define the
-  macro ZLIB_WINAPI when compiling your application's source files.
-
-
-Additional notes
-----------------
-- This DLL, named zlibwapi.dll, is compatible to the old zlib.dll built
-  by Gilles Vollant from the zlib 1.1.x sources, and distributed at
-    http://www.winimage.com/zLibDll
-  It uses the WINAPI calling convention for the exported functions, and
-  includes the minizip functionality. If your application needs that
-  particular build of zlib.dll, you can rename zlibwapi.dll to zlib.dll.
-
-- The new DLL was renamed because there exist several incompatible
-  versions of zlib.dll on the Internet.
-
-- There is also an official DLL build of zlib, named zlib1.dll. This one
-  is exporting the functions using the CDECL convention. See the file
-  win32\DLL_FAQ.txt found in this zlib distribution.
-
-- There used to be a ZLIB_DLL macro in zlib 1.1.x, but now this symbol
-  has a slightly different effect. To avoid compatibility problems, do
-  not define it here.
-
-
-Gilles Vollant
-info@winimage.com
-
-Visual Studio 2013 and 2015 Projects from Sean Hunt
-seandhunt_7@yahoo.com
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/miniunz.vcxproj b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/miniunz.vcxproj
deleted file mode 100644
index 1b36242..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/miniunz.vcxproj
+++ /dev/null
@@ -1,310 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C52F9E7B-498A-42BE-8DB4-85A15694382A}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\minizip\miniunz.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="zlibvc.vcxproj">
-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/miniunz.vcxproj.filters b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/miniunz.vcxproj.filters
deleted file mode 100644
index 0bd1221..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/miniunz.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{048af943-022b-4db6-beeb-a54c34774ee2}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{c1d600d2-888f-4aea-b73e-8b0dd9befa0c}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{0844199a-966b-4f19-81db-1e0125e141b9}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\minizip\miniunz.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/minizip.vcxproj b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/minizip.vcxproj
deleted file mode 100644
index ccd3651..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/minizip.vcxproj
+++ /dev/null
@@ -1,307 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniZip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniZip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniZip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniZip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\minizip\minizip.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="zlibvc.vcxproj">
-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/minizip.vcxproj.filters b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/minizip.vcxproj.filters
deleted file mode 100644
index 7076d76..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/minizip.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{c0419b40-bf50-40da-b153-ff74215b79de}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{bb87b070-735b-478e-92ce-7383abb2f36c}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{f46ab6a6-548f-43cb-ae96-681abb5bd5db}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\minizip\minizip.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/testzlib.vcxproj b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/testzlib.vcxproj
deleted file mode 100644
index 476b8ea..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/testzlib.vcxproj
+++ /dev/null
@@ -1,420 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}</ProjectGuid>
-    <RootNamespace>testzlib</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c" />
-    <ClCompile Include="..\..\..\compress.c" />
-    <ClCompile Include="..\..\..\crc32.c" />
-    <ClCompile Include="..\..\..\deflate.c" />
-    <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c" />
-    <ClCompile Include="..\..\..\inflate.c" />
-    <ClCompile Include="..\..\..\inftrees.c" />
-    <ClCompile Include="..\..\testzlib\testzlib.c" />
-    <ClCompile Include="..\..\..\trees.c" />
-    <ClCompile Include="..\..\..\uncompr.c" />
-    <ClCompile Include="..\..\..\zutil.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/testzlib.vcxproj.filters b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/testzlib.vcxproj.filters
deleted file mode 100644
index 3276491..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/testzlib.vcxproj.filters
+++ /dev/null
@@ -1,58 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{c1f6a2e3-5da5-4955-8653-310d3efe05a9}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{c2aaffdc-2c95-4d6f-8466-4bec5890af2c}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{c274fe07-05f2-461c-964b-f6341e4e7eb5}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\compress.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\crc32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\deflate.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\infback.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inflate.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inftrees.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\testzlib\testzlib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\trees.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\uncompr.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zutil.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/testzlibdll.vcxproj b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/testzlibdll.vcxproj
deleted file mode 100644
index 8e38876..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/testzlibdll.vcxproj
+++ /dev/null
@@ -1,310 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C52F9E7B-498A-42BE-8DB4-85A15694366A}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\testzlib\testzlib.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="zlibvc.vcxproj">
-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/testzlibdll.vcxproj.filters b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/testzlibdll.vcxproj.filters
deleted file mode 100644
index ab87f09..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/testzlibdll.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{fa61a89f-93fc-4c89-b29e-36224b7592f4}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{d4b85da0-2ba2-4934-b57f-e2584e3848ee}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{e573e075-00bd-4a7d-bd67-a8cc9bfc5aca}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\testzlib\testzlib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/zlib.rc b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/zlib.rc
deleted file mode 100644
index c4e4b01..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/zlib.rc
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <windows.h>
-
-#define IDR_VERSION1  1
-IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1, 2, 11, 0
-  PRODUCTVERSION 1, 2, 11, 0
-  FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
-  FILEFLAGS	0
-  FILEOS	VOS_DOS_WINDOWS32
-  FILETYPE	VFT_DLL
-  FILESUBTYPE	0	// not used
-BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-    BLOCK "040904E4"
-    //language ID = U.S. English, char set = Windows, Multilingual
-
-    BEGIN
-      VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.2.11\0"
-      VALUE "InternalName",	"zlib\0"
-      VALUE "OriginalFilename",	"zlibwapi.dll\0"
-      VALUE "ProductName",	"ZLib.DLL\0"
-      VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
-    END
-  END
-  BLOCK "VarFileInfo"
-  BEGIN
-    VALUE "Translation", 0x0409, 1252
-  END
-END
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/zlibstat.vcxproj b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/zlibstat.vcxproj
deleted file mode 100644
index 45389a3..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/zlibstat.vcxproj
+++ /dev/null
@@ -1,473 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx64
-bld_ml64.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx64
-bld_ml64.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c" />
-    <ClCompile Include="..\..\..\compress.c" />
-    <ClCompile Include="..\..\..\crc32.c" />
-    <ClCompile Include="..\..\..\deflate.c" />
-    <ClCompile Include="..\..\..\gzclose.c" />
-    <ClCompile Include="..\..\..\gzlib.c" />
-    <ClCompile Include="..\..\..\gzread.c" />
-    <ClCompile Include="..\..\..\gzwrite.c" />
-    <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c" />
-    <ClCompile Include="..\..\..\inflate.c" />
-    <ClCompile Include="..\..\..\inftrees.c" />
-    <ClCompile Include="..\..\minizip\ioapi.c" />
-    <ClCompile Include="..\..\..\trees.c" />
-    <ClCompile Include="..\..\..\uncompr.c" />
-    <ClCompile Include="..\..\minizip\unzip.c" />
-    <ClCompile Include="..\..\minizip\zip.c" />
-    <ClCompile Include="..\..\..\zutil.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="zlib.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="zlibvc.def" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/zlibstat.vcxproj.filters b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/zlibstat.vcxproj.filters
deleted file mode 100644
index 0c8b250..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/zlibstat.vcxproj.filters
+++ /dev/null
@@ -1,77 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{174213f6-7f66-4ae8-a3a8-a1e0a1e6ffdd}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\compress.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\crc32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\deflate.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\gzclose.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\gzlib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\gzread.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\gzwrite.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\infback.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inflate.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inftrees.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\minizip\ioapi.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\trees.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\uncompr.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\minizip\unzip.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\minizip\zip.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zutil.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="zlib.rc">
-      <Filter>Source Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="zlibvc.def">
-      <Filter>Source Files</Filter>
-    </None>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/zlibvc.def b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/zlibvc.def
deleted file mode 100644
index f876c3b..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/zlibvc.def
+++ /dev/null
@@ -1,153 +0,0 @@
-LIBRARY
-; zlib data compression and ZIP file I/O library
-
-VERSION		1.2
-
-EXPORTS
-        adler32                                  @1
-        compress                                 @2
-        crc32                                    @3
-        deflate                                  @4
-        deflateCopy                              @5
-        deflateEnd                               @6
-        deflateInit2_                            @7
-        deflateInit_                             @8
-        deflateParams                            @9
-        deflateReset                             @10
-        deflateSetDictionary                     @11
-        gzclose                                  @12
-        gzdopen                                  @13
-        gzerror                                  @14
-        gzflush                                  @15
-        gzopen                                   @16
-        gzread                                   @17
-        gzwrite                                  @18
-        inflate                                  @19
-        inflateEnd                               @20
-        inflateInit2_                            @21
-        inflateInit_                             @22
-        inflateReset                             @23
-        inflateSetDictionary                     @24
-        inflateSync                              @25
-        uncompress                               @26
-        zlibVersion                              @27
-        gzprintf                                 @28
-        gzputc                                   @29
-        gzgetc                                   @30
-        gzseek                                   @31
-        gzrewind                                 @32
-        gztell                                   @33
-        gzeof                                    @34
-        gzsetparams                              @35
-        zError                                   @36
-        inflateSyncPoint                         @37
-        get_crc_table                            @38
-        compress2                                @39
-        gzputs                                   @40
-        gzgets                                   @41
-        inflateCopy                              @42
-        inflateBackInit_                         @43
-        inflateBack                              @44
-        inflateBackEnd                           @45
-        compressBound                            @46
-        deflateBound                             @47
-        gzclearerr                               @48
-        gzungetc                                 @49
-        zlibCompileFlags                         @50
-        deflatePrime                             @51
-        deflatePending                           @52
-
-        unzOpen                                  @61
-        unzClose                                 @62
-        unzGetGlobalInfo                         @63
-        unzGetCurrentFileInfo                    @64
-        unzGoToFirstFile                         @65
-        unzGoToNextFile                          @66
-        unzOpenCurrentFile                       @67
-        unzReadCurrentFile                       @68
-        unzOpenCurrentFile3                      @69
-        unztell                                  @70
-        unzeof                                   @71
-        unzCloseCurrentFile                      @72
-        unzGetGlobalComment                      @73
-        unzStringFileNameCompare                 @74
-        unzLocateFile                            @75
-        unzGetLocalExtrafield                    @76
-        unzOpen2                                 @77
-        unzOpenCurrentFile2                      @78
-        unzOpenCurrentFilePassword               @79
-
-        zipOpen                                  @80
-        zipOpenNewFileInZip                      @81
-        zipWriteInFileInZip                      @82
-        zipCloseFileInZip                        @83
-        zipClose                                 @84
-        zipOpenNewFileInZip2                     @86
-        zipCloseFileInZipRaw                     @87
-        zipOpen2                                 @88
-        zipOpenNewFileInZip3                     @89
-
-        unzGetFilePos                            @100
-        unzGoToFilePos                           @101
-
-        fill_win32_filefunc                      @110
-
-; zlibwapi v1.2.4 added:
-        fill_win32_filefunc64                   @111
-        fill_win32_filefunc64A                  @112
-        fill_win32_filefunc64W                  @113
-
-        unzOpen64                               @120
-        unzOpen2_64                             @121
-        unzGetGlobalInfo64                      @122
-        unzGetCurrentFileInfo64                 @124
-        unzGetCurrentFileZStreamPos64           @125
-        unztell64                               @126
-        unzGetFilePos64                         @127
-        unzGoToFilePos64                        @128
-
-        zipOpen64                               @130
-        zipOpen2_64                             @131
-        zipOpenNewFileInZip64                   @132
-        zipOpenNewFileInZip2_64                 @133
-        zipOpenNewFileInZip3_64                 @134
-        zipOpenNewFileInZip4_64                 @135
-        zipCloseFileInZipRaw64                  @136
-
-; zlib1 v1.2.4 added:
-        adler32_combine                         @140
-        crc32_combine                           @142
-        deflateSetHeader                        @144
-        deflateTune                             @145
-        gzbuffer                                @146
-        gzclose_r                               @147
-        gzclose_w                               @148
-        gzdirect                                @149
-        gzoffset                                @150
-        inflateGetHeader                        @156
-        inflateMark                             @157
-        inflatePrime                            @158
-        inflateReset2                           @159
-        inflateUndermine                        @160
-
-; zlib1 v1.2.6 added:
-        gzgetc_                                 @161
-        inflateResetKeep                        @163
-        deflateResetKeep                        @164
-
-; zlib1 v1.2.7 added:
-        gzopen_w                                @165
-
-; zlib1 v1.2.8 added:
-        inflateGetDictionary                    @166
-        gzvprintf                               @167
-
-; zlib1 v1.2.9 added:
-        inflateCodesUsed                        @168
-        inflateValidate                         @169
-        uncompress2                             @170
-        gzfread                                 @171
-        gzfwrite                                @172
-        deflateGetDictionary                    @173
-        adler32_z                               @174
-        crc32_z                                 @175
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/zlibvc.sln b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/zlibvc.sln
deleted file mode 100644
index 649f40c..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/zlibvc.sln
+++ /dev/null
@@ -1,135 +0,0 @@
-锘�
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib", "testzlib.vcxproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlibdll", "testzlibdll.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694366A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcxproj", "{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Itanium = Debug|Itanium
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Itanium = Release|Itanium
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-		ReleaseWithoutAsm|Itanium = ReleaseWithoutAsm|Itanium
-		ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32
-		ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.ActiveCfg = Debug|Itanium
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.Build.0 = Debug|Itanium
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.ActiveCfg = Debug|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.Build.0 = Debug|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.ActiveCfg = Release|Itanium
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.Build.0 = Release|Itanium
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = Release|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = Release|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.ActiveCfg = Debug|Itanium
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.Build.0 = Debug|Itanium
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.ActiveCfg = Release|Itanium
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.Build.0 = Release|Itanium
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Itanium
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.Build.0 = Debug|Itanium
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Itanium
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.Build.0 = Release|Itanium
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.ActiveCfg = Debug|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.Build.0 = Debug|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.Build.0 = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.ActiveCfg = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.Build.0 = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.ActiveCfg = Release|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.Build.0 = Release|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.Build.0 = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.Build.0 = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Itanium
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.Build.0 = Debug|Itanium
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Itanium
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.Build.0 = Release|Itanium
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.ActiveCfg = Debug|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.Build.0 = Debug|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.Build.0 = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.ActiveCfg = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.Build.0 = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.ActiveCfg = Release|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.Build.0 = Release|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.Build.0 = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.Build.0 = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/zlibvc.vcxproj b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/zlibvc.vcxproj
deleted file mode 100644
index 7d7c49a..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/zlibvc.vcxproj
+++ /dev/null
@@ -1,657 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8FD826F8-3739-44E6-8CC8-997122E53B8D}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlibwapid</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zlibwapid</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">zlibwapi</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <GenerateMapFile>true</GenerateMapFile>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <GenerateMapFile>true</GenerateMapFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx64
-bld_ml64.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx64
-bld_ml64.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c" />
-    <ClCompile Include="..\..\..\compress.c" />
-    <ClCompile Include="..\..\..\crc32.c" />
-    <ClCompile Include="..\..\..\deflate.c" />
-    <ClCompile Include="..\..\..\gzclose.c" />
-    <ClCompile Include="..\..\..\gzlib.c" />
-    <ClCompile Include="..\..\..\gzread.c" />
-    <ClCompile Include="..\..\..\gzwrite.c" />
-    <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c" />
-    <ClCompile Include="..\..\..\inflate.c" />
-    <ClCompile Include="..\..\..\inftrees.c" />
-    <ClCompile Include="..\..\minizip\ioapi.c" />
-    <ClCompile Include="..\..\minizip\iowin32.c" />
-    <ClCompile Include="..\..\..\trees.c" />
-    <ClCompile Include="..\..\..\uncompr.c" />
-    <ClCompile Include="..\..\minizip\unzip.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\minizip\zip.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zutil.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="zlib.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="zlibvc.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\deflate.h" />
-    <ClInclude Include="..\..\..\infblock.h" />
-    <ClInclude Include="..\..\..\infcodes.h" />
-    <ClInclude Include="..\..\..\inffast.h" />
-    <ClInclude Include="..\..\..\inftrees.h" />
-    <ClInclude Include="..\..\..\infutil.h" />
-    <ClInclude Include="..\..\..\zconf.h" />
-    <ClInclude Include="..\..\..\zlib.h" />
-    <ClInclude Include="..\..\..\zutil.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/zlibvc.vcxproj.filters b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/zlibvc.vcxproj.filters
deleted file mode 100644
index 2278682..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc10/zlibvc.vcxproj.filters
+++ /dev/null
@@ -1,118 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{07934a85-8b61-443d-a0ee-b2eedb74f3cd}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{1d99675b-433d-4a21-9e50-ed4ab8b19762}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{431c0958-fa71-44d0-9084-2d19d100c0cc}</UniqueIdentifier>
-      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\compress.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\crc32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\deflate.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\gzclose.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\gzlib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\gzread.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\gzwrite.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\infback.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inflate.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inftrees.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\minizip\ioapi.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\minizip\iowin32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\trees.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\uncompr.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\minizip\unzip.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\minizip\zip.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zutil.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="zlib.rc">
-      <Filter>Source Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="zlibvc.def">
-      <Filter>Source Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\deflate.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\infblock.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\infcodes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\inffast.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\inftrees.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\infutil.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zconf.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zlib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zutil.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc11/miniunz.vcxproj b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc11/miniunz.vcxproj
deleted file mode 100644
index 99be63d..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc11/miniunz.vcxproj
+++ /dev/null
@@ -1,314 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C52F9E7B-498A-42BE-8DB4-85A15694382A}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\minizip\miniunz.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="zlibvc.vcxproj">
-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc11/minizip.vcxproj b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc11/minizip.vcxproj
deleted file mode 100644
index d6e98f4..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc11/minizip.vcxproj
+++ /dev/null
@@ -1,311 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniZip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniZip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniZip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniZip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\minizip\minizip.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="zlibvc.vcxproj">
-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc11/testzlib.vcxproj b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc11/testzlib.vcxproj
deleted file mode 100644
index 0115dd1..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc11/testzlib.vcxproj
+++ /dev/null
@@ -1,426 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}</ProjectGuid>
-    <RootNamespace>testzlib</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c" />
-    <ClCompile Include="..\..\..\compress.c" />
-    <ClCompile Include="..\..\..\crc32.c" />
-    <ClCompile Include="..\..\..\deflate.c" />
-    <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c" />
-    <ClCompile Include="..\..\..\inflate.c" />
-    <ClCompile Include="..\..\..\inftrees.c" />
-    <ClCompile Include="..\..\testzlib\testzlib.c" />
-    <ClCompile Include="..\..\..\trees.c" />
-    <ClCompile Include="..\..\..\uncompr.c" />
-    <ClCompile Include="..\..\..\zutil.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc11/testzlibdll.vcxproj b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc11/testzlibdll.vcxproj
deleted file mode 100644
index 9d36336..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc11/testzlibdll.vcxproj
+++ /dev/null
@@ -1,314 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C52F9E7B-498A-42BE-8DB4-85A15694366A}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\testzlib\testzlib.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="zlibvc.vcxproj">
-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc11/zlib.rc b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc11/zlib.rc
deleted file mode 100644
index c4e4b01..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc11/zlib.rc
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <windows.h>
-
-#define IDR_VERSION1  1
-IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1, 2, 11, 0
-  PRODUCTVERSION 1, 2, 11, 0
-  FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
-  FILEFLAGS	0
-  FILEOS	VOS_DOS_WINDOWS32
-  FILETYPE	VFT_DLL
-  FILESUBTYPE	0	// not used
-BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-    BLOCK "040904E4"
-    //language ID = U.S. English, char set = Windows, Multilingual
-
-    BEGIN
-      VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.2.11\0"
-      VALUE "InternalName",	"zlib\0"
-      VALUE "OriginalFilename",	"zlibwapi.dll\0"
-      VALUE "ProductName",	"ZLib.DLL\0"
-      VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
-    END
-  END
-  BLOCK "VarFileInfo"
-  BEGIN
-    VALUE "Translation", 0x0409, 1252
-  END
-END
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc11/zlibstat.vcxproj b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc11/zlibstat.vcxproj
deleted file mode 100644
index 64b4d86..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc11/zlibstat.vcxproj
+++ /dev/null
@@ -1,464 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c" />
-    <ClCompile Include="..\..\..\compress.c" />
-    <ClCompile Include="..\..\..\crc32.c" />
-    <ClCompile Include="..\..\..\deflate.c" />
-    <ClCompile Include="..\..\..\gzclose.c" />
-    <ClCompile Include="..\..\..\gzlib.c" />
-    <ClCompile Include="..\..\..\gzread.c" />
-    <ClCompile Include="..\..\..\gzwrite.c" />
-    <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c" />
-    <ClCompile Include="..\..\..\inflate.c" />
-    <ClCompile Include="..\..\..\inftrees.c" />
-    <ClCompile Include="..\..\minizip\ioapi.c" />
-    <ClCompile Include="..\..\..\trees.c" />
-    <ClCompile Include="..\..\..\uncompr.c" />
-    <ClCompile Include="..\..\minizip\unzip.c" />
-    <ClCompile Include="..\..\minizip\zip.c" />
-    <ClCompile Include="..\..\..\zutil.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="zlib.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="zlibvc.def" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc11/zlibvc.def b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc11/zlibvc.def
deleted file mode 100644
index f876c3b..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc11/zlibvc.def
+++ /dev/null
@@ -1,153 +0,0 @@
-LIBRARY
-; zlib data compression and ZIP file I/O library
-
-VERSION		1.2
-
-EXPORTS
-        adler32                                  @1
-        compress                                 @2
-        crc32                                    @3
-        deflate                                  @4
-        deflateCopy                              @5
-        deflateEnd                               @6
-        deflateInit2_                            @7
-        deflateInit_                             @8
-        deflateParams                            @9
-        deflateReset                             @10
-        deflateSetDictionary                     @11
-        gzclose                                  @12
-        gzdopen                                  @13
-        gzerror                                  @14
-        gzflush                                  @15
-        gzopen                                   @16
-        gzread                                   @17
-        gzwrite                                  @18
-        inflate                                  @19
-        inflateEnd                               @20
-        inflateInit2_                            @21
-        inflateInit_                             @22
-        inflateReset                             @23
-        inflateSetDictionary                     @24
-        inflateSync                              @25
-        uncompress                               @26
-        zlibVersion                              @27
-        gzprintf                                 @28
-        gzputc                                   @29
-        gzgetc                                   @30
-        gzseek                                   @31
-        gzrewind                                 @32
-        gztell                                   @33
-        gzeof                                    @34
-        gzsetparams                              @35
-        zError                                   @36
-        inflateSyncPoint                         @37
-        get_crc_table                            @38
-        compress2                                @39
-        gzputs                                   @40
-        gzgets                                   @41
-        inflateCopy                              @42
-        inflateBackInit_                         @43
-        inflateBack                              @44
-        inflateBackEnd                           @45
-        compressBound                            @46
-        deflateBound                             @47
-        gzclearerr                               @48
-        gzungetc                                 @49
-        zlibCompileFlags                         @50
-        deflatePrime                             @51
-        deflatePending                           @52
-
-        unzOpen                                  @61
-        unzClose                                 @62
-        unzGetGlobalInfo                         @63
-        unzGetCurrentFileInfo                    @64
-        unzGoToFirstFile                         @65
-        unzGoToNextFile                          @66
-        unzOpenCurrentFile                       @67
-        unzReadCurrentFile                       @68
-        unzOpenCurrentFile3                      @69
-        unztell                                  @70
-        unzeof                                   @71
-        unzCloseCurrentFile                      @72
-        unzGetGlobalComment                      @73
-        unzStringFileNameCompare                 @74
-        unzLocateFile                            @75
-        unzGetLocalExtrafield                    @76
-        unzOpen2                                 @77
-        unzOpenCurrentFile2                      @78
-        unzOpenCurrentFilePassword               @79
-
-        zipOpen                                  @80
-        zipOpenNewFileInZip                      @81
-        zipWriteInFileInZip                      @82
-        zipCloseFileInZip                        @83
-        zipClose                                 @84
-        zipOpenNewFileInZip2                     @86
-        zipCloseFileInZipRaw                     @87
-        zipOpen2                                 @88
-        zipOpenNewFileInZip3                     @89
-
-        unzGetFilePos                            @100
-        unzGoToFilePos                           @101
-
-        fill_win32_filefunc                      @110
-
-; zlibwapi v1.2.4 added:
-        fill_win32_filefunc64                   @111
-        fill_win32_filefunc64A                  @112
-        fill_win32_filefunc64W                  @113
-
-        unzOpen64                               @120
-        unzOpen2_64                             @121
-        unzGetGlobalInfo64                      @122
-        unzGetCurrentFileInfo64                 @124
-        unzGetCurrentFileZStreamPos64           @125
-        unztell64                               @126
-        unzGetFilePos64                         @127
-        unzGoToFilePos64                        @128
-
-        zipOpen64                               @130
-        zipOpen2_64                             @131
-        zipOpenNewFileInZip64                   @132
-        zipOpenNewFileInZip2_64                 @133
-        zipOpenNewFileInZip3_64                 @134
-        zipOpenNewFileInZip4_64                 @135
-        zipCloseFileInZipRaw64                  @136
-
-; zlib1 v1.2.4 added:
-        adler32_combine                         @140
-        crc32_combine                           @142
-        deflateSetHeader                        @144
-        deflateTune                             @145
-        gzbuffer                                @146
-        gzclose_r                               @147
-        gzclose_w                               @148
-        gzdirect                                @149
-        gzoffset                                @150
-        inflateGetHeader                        @156
-        inflateMark                             @157
-        inflatePrime                            @158
-        inflateReset2                           @159
-        inflateUndermine                        @160
-
-; zlib1 v1.2.6 added:
-        gzgetc_                                 @161
-        inflateResetKeep                        @163
-        deflateResetKeep                        @164
-
-; zlib1 v1.2.7 added:
-        gzopen_w                                @165
-
-; zlib1 v1.2.8 added:
-        inflateGetDictionary                    @166
-        gzvprintf                               @167
-
-; zlib1 v1.2.9 added:
-        inflateCodesUsed                        @168
-        inflateValidate                         @169
-        uncompress2                             @170
-        gzfread                                 @171
-        gzfwrite                                @172
-        deflateGetDictionary                    @173
-        adler32_z                               @174
-        crc32_z                                 @175
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc11/zlibvc.sln b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc11/zlibvc.sln
deleted file mode 100644
index b7e3812..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc11/zlibvc.sln
+++ /dev/null
@@ -1,117 +0,0 @@
-锘�
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib", "testzlib.vcxproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlibdll", "testzlibdll.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694366A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcxproj", "{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Itanium = Debug|Itanium
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Itanium = Release|Itanium
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-		ReleaseWithoutAsm|Itanium = ReleaseWithoutAsm|Itanium
-		ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32
-		ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.ActiveCfg = Debug|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.Build.0 = Debug|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.ActiveCfg = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = Release|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = Release|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.ActiveCfg = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.Build.0 = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.ActiveCfg = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.Build.0 = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.Build.0 = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.Build.0 = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.Build.0 = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.ActiveCfg = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.Build.0 = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.Build.0 = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.Build.0 = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc11/zlibvc.vcxproj b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc11/zlibvc.vcxproj
deleted file mode 100644
index c4cffcc..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc11/zlibvc.vcxproj
+++ /dev/null
@@ -1,688 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8FD826F8-3739-44E6-8CC8-997122E53B8D}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">zlibwapi</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\contrib\masmx64
-bld_ml64.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx64
-bld_ml64.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c" />
-    <ClCompile Include="..\..\..\compress.c" />
-    <ClCompile Include="..\..\..\crc32.c" />
-    <ClCompile Include="..\..\..\deflate.c" />
-    <ClCompile Include="..\..\..\gzclose.c" />
-    <ClCompile Include="..\..\..\gzlib.c" />
-    <ClCompile Include="..\..\..\gzread.c" />
-    <ClCompile Include="..\..\..\gzwrite.c" />
-    <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c" />
-    <ClCompile Include="..\..\..\inflate.c" />
-    <ClCompile Include="..\..\..\inftrees.c" />
-    <ClCompile Include="..\..\minizip\ioapi.c" />
-    <ClCompile Include="..\..\minizip\iowin32.c" />
-    <ClCompile Include="..\..\..\trees.c" />
-    <ClCompile Include="..\..\..\uncompr.c" />
-    <ClCompile Include="..\..\minizip\unzip.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\minizip\zip.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zutil.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="zlib.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="zlibvc.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\deflate.h" />
-    <ClInclude Include="..\..\..\infblock.h" />
-    <ClInclude Include="..\..\..\infcodes.h" />
-    <ClInclude Include="..\..\..\inffast.h" />
-    <ClInclude Include="..\..\..\inftrees.h" />
-    <ClInclude Include="..\..\..\infutil.h" />
-    <ClInclude Include="..\..\..\zconf.h" />
-    <ClInclude Include="..\..\..\zlib.h" />
-    <ClInclude Include="..\..\..\zutil.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc12/miniunz.vcxproj b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc12/miniunz.vcxproj
deleted file mode 100644
index d88ac7f..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc12/miniunz.vcxproj
+++ /dev/null
@@ -1,316 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C52F9E7B-498A-42BE-8DB4-85A15694382A}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\minizip\miniunz.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="zlibvc.vcxproj">
-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc12/minizip.vcxproj b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc12/minizip.vcxproj
deleted file mode 100644
index f1f239c..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc12/minizip.vcxproj
+++ /dev/null
@@ -1,313 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniZip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniZip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniZip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniZip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\minizip\minizip.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="zlibvc.vcxproj">
-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc12/testzlib.vcxproj b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc12/testzlib.vcxproj
deleted file mode 100644
index 64b2cbe..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc12/testzlib.vcxproj
+++ /dev/null
@@ -1,430 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}</ProjectGuid>
-    <RootNamespace>testzlib</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c" />
-    <ClCompile Include="..\..\..\compress.c" />
-    <ClCompile Include="..\..\..\crc32.c" />
-    <ClCompile Include="..\..\..\deflate.c" />
-    <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c" />
-    <ClCompile Include="..\..\..\inflate.c" />
-    <ClCompile Include="..\..\..\inftrees.c" />
-    <ClCompile Include="..\..\testzlib\testzlib.c" />
-    <ClCompile Include="..\..\..\trees.c" />
-    <ClCompile Include="..\..\..\uncompr.c" />
-    <ClCompile Include="..\..\..\zutil.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc12/testzlibdll.vcxproj b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc12/testzlibdll.vcxproj
deleted file mode 100644
index c66573a..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc12/testzlibdll.vcxproj
+++ /dev/null
@@ -1,316 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C52F9E7B-498A-42BE-8DB4-85A15694366A}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\testzlib\testzlib.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="zlibvc.vcxproj">
-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc12/zlib.rc b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc12/zlib.rc
deleted file mode 100644
index c4e4b01..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc12/zlib.rc
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <windows.h>
-
-#define IDR_VERSION1  1
-IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1, 2, 11, 0
-  PRODUCTVERSION 1, 2, 11, 0
-  FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
-  FILEFLAGS	0
-  FILEOS	VOS_DOS_WINDOWS32
-  FILETYPE	VFT_DLL
-  FILESUBTYPE	0	// not used
-BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-    BLOCK "040904E4"
-    //language ID = U.S. English, char set = Windows, Multilingual
-
-    BEGIN
-      VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.2.11\0"
-      VALUE "InternalName",	"zlib\0"
-      VALUE "OriginalFilename",	"zlibwapi.dll\0"
-      VALUE "ProductName",	"ZLib.DLL\0"
-      VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
-    END
-  END
-  BLOCK "VarFileInfo"
-  BEGIN
-    VALUE "Translation", 0x0409, 1252
-  END
-END
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc12/zlibstat.vcxproj b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc12/zlibstat.vcxproj
deleted file mode 100644
index 3fdee7c..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc12/zlibstat.vcxproj
+++ /dev/null
@@ -1,467 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c" />
-    <ClCompile Include="..\..\..\compress.c" />
-    <ClCompile Include="..\..\..\crc32.c" />
-    <ClCompile Include="..\..\..\deflate.c" />
-    <ClCompile Include="..\..\..\gzclose.c" />
-    <ClCompile Include="..\..\..\gzlib.c" />
-    <ClCompile Include="..\..\..\gzread.c" />
-    <ClCompile Include="..\..\..\gzwrite.c" />
-    <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c" />
-    <ClCompile Include="..\..\..\inflate.c" />
-    <ClCompile Include="..\..\..\inftrees.c" />
-    <ClCompile Include="..\..\minizip\ioapi.c" />
-    <ClCompile Include="..\..\..\trees.c" />
-    <ClCompile Include="..\..\..\uncompr.c" />
-    <ClCompile Include="..\..\minizip\unzip.c" />
-    <ClCompile Include="..\..\minizip\zip.c" />
-    <ClCompile Include="..\..\..\zutil.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="zlib.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="zlibvc.def" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc12/zlibvc.def b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc12/zlibvc.def
deleted file mode 100644
index f876c3b..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc12/zlibvc.def
+++ /dev/null
@@ -1,153 +0,0 @@
-LIBRARY
-; zlib data compression and ZIP file I/O library
-
-VERSION		1.2
-
-EXPORTS
-        adler32                                  @1
-        compress                                 @2
-        crc32                                    @3
-        deflate                                  @4
-        deflateCopy                              @5
-        deflateEnd                               @6
-        deflateInit2_                            @7
-        deflateInit_                             @8
-        deflateParams                            @9
-        deflateReset                             @10
-        deflateSetDictionary                     @11
-        gzclose                                  @12
-        gzdopen                                  @13
-        gzerror                                  @14
-        gzflush                                  @15
-        gzopen                                   @16
-        gzread                                   @17
-        gzwrite                                  @18
-        inflate                                  @19
-        inflateEnd                               @20
-        inflateInit2_                            @21
-        inflateInit_                             @22
-        inflateReset                             @23
-        inflateSetDictionary                     @24
-        inflateSync                              @25
-        uncompress                               @26
-        zlibVersion                              @27
-        gzprintf                                 @28
-        gzputc                                   @29
-        gzgetc                                   @30
-        gzseek                                   @31
-        gzrewind                                 @32
-        gztell                                   @33
-        gzeof                                    @34
-        gzsetparams                              @35
-        zError                                   @36
-        inflateSyncPoint                         @37
-        get_crc_table                            @38
-        compress2                                @39
-        gzputs                                   @40
-        gzgets                                   @41
-        inflateCopy                              @42
-        inflateBackInit_                         @43
-        inflateBack                              @44
-        inflateBackEnd                           @45
-        compressBound                            @46
-        deflateBound                             @47
-        gzclearerr                               @48
-        gzungetc                                 @49
-        zlibCompileFlags                         @50
-        deflatePrime                             @51
-        deflatePending                           @52
-
-        unzOpen                                  @61
-        unzClose                                 @62
-        unzGetGlobalInfo                         @63
-        unzGetCurrentFileInfo                    @64
-        unzGoToFirstFile                         @65
-        unzGoToNextFile                          @66
-        unzOpenCurrentFile                       @67
-        unzReadCurrentFile                       @68
-        unzOpenCurrentFile3                      @69
-        unztell                                  @70
-        unzeof                                   @71
-        unzCloseCurrentFile                      @72
-        unzGetGlobalComment                      @73
-        unzStringFileNameCompare                 @74
-        unzLocateFile                            @75
-        unzGetLocalExtrafield                    @76
-        unzOpen2                                 @77
-        unzOpenCurrentFile2                      @78
-        unzOpenCurrentFilePassword               @79
-
-        zipOpen                                  @80
-        zipOpenNewFileInZip                      @81
-        zipWriteInFileInZip                      @82
-        zipCloseFileInZip                        @83
-        zipClose                                 @84
-        zipOpenNewFileInZip2                     @86
-        zipCloseFileInZipRaw                     @87
-        zipOpen2                                 @88
-        zipOpenNewFileInZip3                     @89
-
-        unzGetFilePos                            @100
-        unzGoToFilePos                           @101
-
-        fill_win32_filefunc                      @110
-
-; zlibwapi v1.2.4 added:
-        fill_win32_filefunc64                   @111
-        fill_win32_filefunc64A                  @112
-        fill_win32_filefunc64W                  @113
-
-        unzOpen64                               @120
-        unzOpen2_64                             @121
-        unzGetGlobalInfo64                      @122
-        unzGetCurrentFileInfo64                 @124
-        unzGetCurrentFileZStreamPos64           @125
-        unztell64                               @126
-        unzGetFilePos64                         @127
-        unzGoToFilePos64                        @128
-
-        zipOpen64                               @130
-        zipOpen2_64                             @131
-        zipOpenNewFileInZip64                   @132
-        zipOpenNewFileInZip2_64                 @133
-        zipOpenNewFileInZip3_64                 @134
-        zipOpenNewFileInZip4_64                 @135
-        zipCloseFileInZipRaw64                  @136
-
-; zlib1 v1.2.4 added:
-        adler32_combine                         @140
-        crc32_combine                           @142
-        deflateSetHeader                        @144
-        deflateTune                             @145
-        gzbuffer                                @146
-        gzclose_r                               @147
-        gzclose_w                               @148
-        gzdirect                                @149
-        gzoffset                                @150
-        inflateGetHeader                        @156
-        inflateMark                             @157
-        inflatePrime                            @158
-        inflateReset2                           @159
-        inflateUndermine                        @160
-
-; zlib1 v1.2.6 added:
-        gzgetc_                                 @161
-        inflateResetKeep                        @163
-        deflateResetKeep                        @164
-
-; zlib1 v1.2.7 added:
-        gzopen_w                                @165
-
-; zlib1 v1.2.8 added:
-        inflateGetDictionary                    @166
-        gzvprintf                               @167
-
-; zlib1 v1.2.9 added:
-        inflateCodesUsed                        @168
-        inflateValidate                         @169
-        uncompress2                             @170
-        gzfread                                 @171
-        gzfwrite                                @172
-        deflateGetDictionary                    @173
-        adler32_z                               @174
-        crc32_z                                 @175
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc12/zlibvc.sln b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc12/zlibvc.sln
deleted file mode 100644
index dcda229..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc12/zlibvc.sln
+++ /dev/null
@@ -1,119 +0,0 @@
-锘�
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.40629.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib", "testzlib.vcxproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlibdll", "testzlibdll.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694366A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcxproj", "{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Itanium = Debug|Itanium
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Itanium = Release|Itanium
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-		ReleaseWithoutAsm|Itanium = ReleaseWithoutAsm|Itanium
-		ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32
-		ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.ActiveCfg = Debug|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.Build.0 = Debug|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.ActiveCfg = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = Release|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = Release|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.ActiveCfg = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.Build.0 = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.ActiveCfg = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.Build.0 = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.Build.0 = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.Build.0 = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.Build.0 = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.ActiveCfg = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.Build.0 = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.Build.0 = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.Build.0 = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc12/zlibvc.vcxproj b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc12/zlibvc.vcxproj
deleted file mode 100644
index ab2b6c3..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc12/zlibvc.vcxproj
+++ /dev/null
@@ -1,692 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8FD826F8-3739-44E6-8CC8-997122E53B8D}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">zlibwapi</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\contrib\masmx64
-bld_ml64.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx64
-bld_ml64.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c" />
-    <ClCompile Include="..\..\..\compress.c" />
-    <ClCompile Include="..\..\..\crc32.c" />
-    <ClCompile Include="..\..\..\deflate.c" />
-    <ClCompile Include="..\..\..\gzclose.c" />
-    <ClCompile Include="..\..\..\gzlib.c" />
-    <ClCompile Include="..\..\..\gzread.c" />
-    <ClCompile Include="..\..\..\gzwrite.c" />
-    <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c" />
-    <ClCompile Include="..\..\..\inflate.c" />
-    <ClCompile Include="..\..\..\inftrees.c" />
-    <ClCompile Include="..\..\minizip\ioapi.c" />
-    <ClCompile Include="..\..\minizip\iowin32.c" />
-    <ClCompile Include="..\..\..\trees.c" />
-    <ClCompile Include="..\..\..\uncompr.c" />
-    <ClCompile Include="..\..\minizip\unzip.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\minizip\zip.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zutil.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="zlib.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="zlibvc.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\deflate.h" />
-    <ClInclude Include="..\..\..\infblock.h" />
-    <ClInclude Include="..\..\..\infcodes.h" />
-    <ClInclude Include="..\..\..\inffast.h" />
-    <ClInclude Include="..\..\..\inftrees.h" />
-    <ClInclude Include="..\..\..\infutil.h" />
-    <ClInclude Include="..\..\..\zconf.h" />
-    <ClInclude Include="..\..\..\zlib.h" />
-    <ClInclude Include="..\..\..\zutil.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc14/miniunz.vcxproj b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc14/miniunz.vcxproj
deleted file mode 100644
index 9b5c075..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc14/miniunz.vcxproj
+++ /dev/null
@@ -1,316 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C52F9E7B-498A-42BE-8DB4-85A15694382A}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\minizip\miniunz.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="zlibvc.vcxproj">
-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc14/minizip.vcxproj b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc14/minizip.vcxproj
deleted file mode 100644
index 968a410..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc14/minizip.vcxproj
+++ /dev/null
@@ -1,313 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniZip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniZip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniZip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniZip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\minizip\minizip.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="zlibvc.vcxproj">
-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc14/testzlib.vcxproj b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc14/testzlib.vcxproj
deleted file mode 100644
index 2c37125..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc14/testzlib.vcxproj
+++ /dev/null
@@ -1,430 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}</ProjectGuid>
-    <RootNamespace>testzlib</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c" />
-    <ClCompile Include="..\..\..\compress.c" />
-    <ClCompile Include="..\..\..\crc32.c" />
-    <ClCompile Include="..\..\..\deflate.c" />
-    <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c" />
-    <ClCompile Include="..\..\..\inflate.c" />
-    <ClCompile Include="..\..\..\inftrees.c" />
-    <ClCompile Include="..\..\testzlib\testzlib.c" />
-    <ClCompile Include="..\..\..\trees.c" />
-    <ClCompile Include="..\..\..\uncompr.c" />
-    <ClCompile Include="..\..\..\zutil.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc14/testzlibdll.vcxproj b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc14/testzlibdll.vcxproj
deleted file mode 100644
index d87474d..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc14/testzlibdll.vcxproj
+++ /dev/null
@@ -1,316 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C52F9E7B-498A-42BE-8DB4-85A15694366A}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\testzlib\testzlib.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="zlibvc.vcxproj">
-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc14/zlib.rc b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc14/zlib.rc
deleted file mode 100644
index c4e4b01..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc14/zlib.rc
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <windows.h>
-
-#define IDR_VERSION1  1
-IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1, 2, 11, 0
-  PRODUCTVERSION 1, 2, 11, 0
-  FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
-  FILEFLAGS	0
-  FILEOS	VOS_DOS_WINDOWS32
-  FILETYPE	VFT_DLL
-  FILESUBTYPE	0	// not used
-BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-    BLOCK "040904E4"
-    //language ID = U.S. English, char set = Windows, Multilingual
-
-    BEGIN
-      VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.2.11\0"
-      VALUE "InternalName",	"zlib\0"
-      VALUE "OriginalFilename",	"zlibwapi.dll\0"
-      VALUE "ProductName",	"ZLib.DLL\0"
-      VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
-    END
-  END
-  BLOCK "VarFileInfo"
-  BEGIN
-    VALUE "Translation", 0x0409, 1252
-  END
-END
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc14/zlibstat.vcxproj b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc14/zlibstat.vcxproj
deleted file mode 100644
index 3e4b986..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc14/zlibstat.vcxproj
+++ /dev/null
@@ -1,467 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c" />
-    <ClCompile Include="..\..\..\compress.c" />
-    <ClCompile Include="..\..\..\crc32.c" />
-    <ClCompile Include="..\..\..\deflate.c" />
-    <ClCompile Include="..\..\..\gzclose.c" />
-    <ClCompile Include="..\..\..\gzlib.c" />
-    <ClCompile Include="..\..\..\gzread.c" />
-    <ClCompile Include="..\..\..\gzwrite.c" />
-    <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c" />
-    <ClCompile Include="..\..\..\inflate.c" />
-    <ClCompile Include="..\..\..\inftrees.c" />
-    <ClCompile Include="..\..\minizip\ioapi.c" />
-    <ClCompile Include="..\..\..\trees.c" />
-    <ClCompile Include="..\..\..\uncompr.c" />
-    <ClCompile Include="..\..\minizip\unzip.c" />
-    <ClCompile Include="..\..\minizip\zip.c" />
-    <ClCompile Include="..\..\..\zutil.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="zlib.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="zlibvc.def" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc14/zlibvc.def b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc14/zlibvc.def
deleted file mode 100644
index f876c3b..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc14/zlibvc.def
+++ /dev/null
@@ -1,153 +0,0 @@
-LIBRARY
-; zlib data compression and ZIP file I/O library
-
-VERSION		1.2
-
-EXPORTS
-        adler32                                  @1
-        compress                                 @2
-        crc32                                    @3
-        deflate                                  @4
-        deflateCopy                              @5
-        deflateEnd                               @6
-        deflateInit2_                            @7
-        deflateInit_                             @8
-        deflateParams                            @9
-        deflateReset                             @10
-        deflateSetDictionary                     @11
-        gzclose                                  @12
-        gzdopen                                  @13
-        gzerror                                  @14
-        gzflush                                  @15
-        gzopen                                   @16
-        gzread                                   @17
-        gzwrite                                  @18
-        inflate                                  @19
-        inflateEnd                               @20
-        inflateInit2_                            @21
-        inflateInit_                             @22
-        inflateReset                             @23
-        inflateSetDictionary                     @24
-        inflateSync                              @25
-        uncompress                               @26
-        zlibVersion                              @27
-        gzprintf                                 @28
-        gzputc                                   @29
-        gzgetc                                   @30
-        gzseek                                   @31
-        gzrewind                                 @32
-        gztell                                   @33
-        gzeof                                    @34
-        gzsetparams                              @35
-        zError                                   @36
-        inflateSyncPoint                         @37
-        get_crc_table                            @38
-        compress2                                @39
-        gzputs                                   @40
-        gzgets                                   @41
-        inflateCopy                              @42
-        inflateBackInit_                         @43
-        inflateBack                              @44
-        inflateBackEnd                           @45
-        compressBound                            @46
-        deflateBound                             @47
-        gzclearerr                               @48
-        gzungetc                                 @49
-        zlibCompileFlags                         @50
-        deflatePrime                             @51
-        deflatePending                           @52
-
-        unzOpen                                  @61
-        unzClose                                 @62
-        unzGetGlobalInfo                         @63
-        unzGetCurrentFileInfo                    @64
-        unzGoToFirstFile                         @65
-        unzGoToNextFile                          @66
-        unzOpenCurrentFile                       @67
-        unzReadCurrentFile                       @68
-        unzOpenCurrentFile3                      @69
-        unztell                                  @70
-        unzeof                                   @71
-        unzCloseCurrentFile                      @72
-        unzGetGlobalComment                      @73
-        unzStringFileNameCompare                 @74
-        unzLocateFile                            @75
-        unzGetLocalExtrafield                    @76
-        unzOpen2                                 @77
-        unzOpenCurrentFile2                      @78
-        unzOpenCurrentFilePassword               @79
-
-        zipOpen                                  @80
-        zipOpenNewFileInZip                      @81
-        zipWriteInFileInZip                      @82
-        zipCloseFileInZip                        @83
-        zipClose                                 @84
-        zipOpenNewFileInZip2                     @86
-        zipCloseFileInZipRaw                     @87
-        zipOpen2                                 @88
-        zipOpenNewFileInZip3                     @89
-
-        unzGetFilePos                            @100
-        unzGoToFilePos                           @101
-
-        fill_win32_filefunc                      @110
-
-; zlibwapi v1.2.4 added:
-        fill_win32_filefunc64                   @111
-        fill_win32_filefunc64A                  @112
-        fill_win32_filefunc64W                  @113
-
-        unzOpen64                               @120
-        unzOpen2_64                             @121
-        unzGetGlobalInfo64                      @122
-        unzGetCurrentFileInfo64                 @124
-        unzGetCurrentFileZStreamPos64           @125
-        unztell64                               @126
-        unzGetFilePos64                         @127
-        unzGoToFilePos64                        @128
-
-        zipOpen64                               @130
-        zipOpen2_64                             @131
-        zipOpenNewFileInZip64                   @132
-        zipOpenNewFileInZip2_64                 @133
-        zipOpenNewFileInZip3_64                 @134
-        zipOpenNewFileInZip4_64                 @135
-        zipCloseFileInZipRaw64                  @136
-
-; zlib1 v1.2.4 added:
-        adler32_combine                         @140
-        crc32_combine                           @142
-        deflateSetHeader                        @144
-        deflateTune                             @145
-        gzbuffer                                @146
-        gzclose_r                               @147
-        gzclose_w                               @148
-        gzdirect                                @149
-        gzoffset                                @150
-        inflateGetHeader                        @156
-        inflateMark                             @157
-        inflatePrime                            @158
-        inflateReset2                           @159
-        inflateUndermine                        @160
-
-; zlib1 v1.2.6 added:
-        gzgetc_                                 @161
-        inflateResetKeep                        @163
-        deflateResetKeep                        @164
-
-; zlib1 v1.2.7 added:
-        gzopen_w                                @165
-
-; zlib1 v1.2.8 added:
-        inflateGetDictionary                    @166
-        gzvprintf                               @167
-
-; zlib1 v1.2.9 added:
-        inflateCodesUsed                        @168
-        inflateValidate                         @169
-        uncompress2                             @170
-        gzfread                                 @171
-        gzfwrite                                @172
-        deflateGetDictionary                    @173
-        adler32_z                               @174
-        crc32_z                                 @175
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc14/zlibvc.sln b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc14/zlibvc.sln
deleted file mode 100644
index 6f4a107..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc14/zlibvc.sln
+++ /dev/null
@@ -1,119 +0,0 @@
-锘�
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib", "testzlib.vcxproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlibdll", "testzlibdll.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694366A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcxproj", "{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Itanium = Debug|Itanium
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Itanium = Release|Itanium
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-		ReleaseWithoutAsm|Itanium = ReleaseWithoutAsm|Itanium
-		ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32
-		ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.ActiveCfg = Debug|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.Build.0 = Debug|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.ActiveCfg = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = Release|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = Release|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.ActiveCfg = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.Build.0 = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.ActiveCfg = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.Build.0 = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.Build.0 = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.Build.0 = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.Build.0 = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.ActiveCfg = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.Build.0 = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.Build.0 = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.Build.0 = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc14/zlibvc.vcxproj b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc14/zlibvc.vcxproj
deleted file mode 100644
index f8f673c..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc14/zlibvc.vcxproj
+++ /dev/null
@@ -1,692 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8FD826F8-3739-44E6-8CC8-997122E53B8D}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">zlibwapi</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\contrib\masmx64
-bld_ml64.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx64
-bld_ml64.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c" />
-    <ClCompile Include="..\..\..\compress.c" />
-    <ClCompile Include="..\..\..\crc32.c" />
-    <ClCompile Include="..\..\..\deflate.c" />
-    <ClCompile Include="..\..\..\gzclose.c" />
-    <ClCompile Include="..\..\..\gzlib.c" />
-    <ClCompile Include="..\..\..\gzread.c" />
-    <ClCompile Include="..\..\..\gzwrite.c" />
-    <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c" />
-    <ClCompile Include="..\..\..\inflate.c" />
-    <ClCompile Include="..\..\..\inftrees.c" />
-    <ClCompile Include="..\..\minizip\ioapi.c" />
-    <ClCompile Include="..\..\minizip\iowin32.c" />
-    <ClCompile Include="..\..\..\trees.c" />
-    <ClCompile Include="..\..\..\uncompr.c" />
-    <ClCompile Include="..\..\minizip\unzip.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\minizip\zip.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zutil.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="zlib.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="zlibvc.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\deflate.h" />
-    <ClInclude Include="..\..\..\infblock.h" />
-    <ClInclude Include="..\..\..\infcodes.h" />
-    <ClInclude Include="..\..\..\inffast.h" />
-    <ClInclude Include="..\..\..\inftrees.h" />
-    <ClInclude Include="..\..\..\infutil.h" />
-    <ClInclude Include="..\..\..\zconf.h" />
-    <ClInclude Include="..\..\..\zlib.h" />
-    <ClInclude Include="..\..\..\zutil.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc9/miniunz.vcproj b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc9/miniunz.vcproj
deleted file mode 100644
index 038a9e5..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc9/miniunz.vcproj
+++ /dev/null
@@ -1,565 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="miniunz"
-	ProjectGUID="{C52F9E7B-498A-42BE-8DB4-85A15694382A}"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-		<Platform
-			Name="Itanium"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="x86\MiniUnzip$(ConfigurationName)"
-			IntermediateDirectory="x86\MiniUnzip$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="x86\ZlibDllDebug\zlibwapi.lib"
-				OutputFile="$(OutDir)/miniunz.exe"
-				LinkIncremental="2"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/miniunz.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="x86\MiniUnzip$(ConfigurationName)"
-			IntermediateDirectory="x86\MiniUnzip$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE"
-				StringPooling="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib"
-				OutputFile="$(OutDir)/miniunz.exe"
-				LinkIncremental="1"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="x64\MiniUnzip$(ConfigurationName)"
-			IntermediateDirectory="x64\MiniUnzip$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib"
-				OutputFile="$(OutDir)/miniunz.exe"
-				LinkIncremental="2"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/miniunz.pdb"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Itanium"
-			OutputDirectory="ia64\MiniUnzip$(ConfigurationName)"
-			IntermediateDirectory="ia64\MiniUnzip$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="2"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib"
-				OutputFile="$(OutDir)/miniunz.exe"
-				LinkIncremental="2"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/miniunz.pdb"
-				SubSystem="1"
-				TargetMachine="5"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="x64\MiniUnzip$(ConfigurationName)"
-			IntermediateDirectory="x64\MiniUnzip$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"
-				StringPooling="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="x64\ZlibDllRelease\zlibwapi.lib"
-				OutputFile="$(OutDir)/miniunz.exe"
-				LinkIncremental="1"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Itanium"
-			OutputDirectory="ia64\MiniUnzip$(ConfigurationName)"
-			IntermediateDirectory="ia64\MiniUnzip$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="2"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"
-				StringPooling="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ia64\ZlibDllRelease\zlibwapi.lib"
-				OutputFile="$(OutDir)/miniunz.exe"
-				LinkIncremental="1"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="5"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
-			>
-			<File
-				RelativePath="..\..\minizip\miniunz.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc9/minizip.vcproj b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc9/minizip.vcproj
deleted file mode 100644
index ad40239..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc9/minizip.vcproj
+++ /dev/null
@@ -1,562 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="minizip"
-	ProjectGUID="{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-		<Platform
-			Name="Itanium"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="x86\MiniZip$(ConfigurationName)"
-			IntermediateDirectory="x86\MiniZip$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="x86\ZlibDllDebug\zlibwapi.lib"
-				OutputFile="$(OutDir)/minizip.exe"
-				LinkIncremental="2"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/minizip.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="x86\MiniZip$(ConfigurationName)"
-			IntermediateDirectory="x86\MiniZip$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE"
-				StringPooling="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib"
-				OutputFile="$(OutDir)/minizip.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="x64\$(ConfigurationName)"
-			IntermediateDirectory="x64\$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib"
-				OutputFile="$(OutDir)/minizip.exe"
-				LinkIncremental="2"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/minizip.pdb"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Itanium"
-			OutputDirectory="ia64\$(ConfigurationName)"
-			IntermediateDirectory="ia64\$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="2"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib"
-				OutputFile="$(OutDir)/minizip.exe"
-				LinkIncremental="2"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/minizip.pdb"
-				SubSystem="1"
-				TargetMachine="5"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="x64\$(ConfigurationName)"
-			IntermediateDirectory="x64\$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"
-				StringPooling="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="x64\ZlibDllRelease\zlibwapi.lib"
-				OutputFile="$(OutDir)/minizip.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Itanium"
-			OutputDirectory="ia64\$(ConfigurationName)"
-			IntermediateDirectory="ia64\$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="2"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"
-				StringPooling="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ia64\ZlibDllRelease\zlibwapi.lib"
-				OutputFile="$(OutDir)/minizip.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="5"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
-			>
-			<File
-				RelativePath="..\..\minizip\minizip.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc9/testzlib.vcproj b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc9/testzlib.vcproj
deleted file mode 100644
index c9f19d2..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc9/testzlib.vcproj
+++ /dev/null
@@ -1,852 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="testzlib"
-	ProjectGUID="{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"
-	RootNamespace="testzlib"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-		<Platform
-			Name="Itanium"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="x86\TestZlib$(ConfigurationName)"
-			IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\.."
-				PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				AssemblerOutput="4"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj"
-				OutputFile="$(OutDir)/testzlib.exe"
-				LinkIncremental="2"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="x64\TestZlib$(ConfigurationName)"
-			IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\.."
-				PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="false"
-				AssemblerListingLocation="$(IntDir)\"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj"
-				GenerateManifest="false"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Itanium"
-			OutputDirectory="ia64\TestZlib$(ConfigurationName)"
-			IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="2"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\.."
-				PreprocessorDefinitions="ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				AssemblerOutput="4"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/testzlib.exe"
-				LinkIncremental="2"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
-				SubSystem="1"
-				TargetMachine="5"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseWithoutAsm|Win32"
-			OutputDirectory="x86\TestZlib$(ConfigurationName)"
-			IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\.."
-				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
-				StringPooling="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/testzlib.exe"
-				LinkIncremental="1"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseWithoutAsm|x64"
-			OutputDirectory="x64\TestZlib$(ConfigurationName)"
-			IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\.."
-				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				AssemblerListingLocation="$(IntDir)\"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				GenerateManifest="false"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseWithoutAsm|Itanium"
-			OutputDirectory="ia64\TestZlib$(ConfigurationName)"
-			IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="2"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\.."
-				PreprocessorDefinitions="ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
-				StringPooling="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/testzlib.exe"
-				LinkIncremental="1"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="5"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="x86\TestZlib$(ConfigurationName)"
-			IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\.."
-				PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
-				StringPooling="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj"
-				OutputFile="$(OutDir)/testzlib.exe"
-				LinkIncremental="1"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="x64\TestZlib$(ConfigurationName)"
-			IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\.."
-				PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				AssemblerListingLocation="$(IntDir)\"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj"
-				GenerateManifest="false"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Itanium"
-			OutputDirectory="ia64\TestZlib$(ConfigurationName)"
-			IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="2"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\.."
-				PreprocessorDefinitions="ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
-				StringPooling="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/testzlib.exe"
-				LinkIncremental="1"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="5"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
-			>
-			<File
-				RelativePath="..\..\..\adler32.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compress.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\crc32.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\deflate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\infback.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\masmx64\inffas8664.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Itanium"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseWithoutAsm|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseWithoutAsm|Itanium"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Itanium"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\inffast.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\inflate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\inftrees.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\testzlib\testzlib.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\trees.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\uncompr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\zutil.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc9/testzlibdll.vcproj b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc9/testzlibdll.vcproj
deleted file mode 100644
index d7530fd..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc9/testzlibdll.vcproj
+++ /dev/null
@@ -1,565 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="TestZlibDll"
-	ProjectGUID="{C52F9E7B-498A-42BE-8DB4-85A15694366A}"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-		<Platform
-			Name="Itanium"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="x86\TestZlibDll$(ConfigurationName)"
-			IntermediateDirectory="x86\TestZlibDll$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="x86\ZlibDllDebug\zlibwapi.lib"
-				OutputFile="$(OutDir)/testzlib.exe"
-				LinkIncremental="2"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="x86\TestZlibDll$(ConfigurationName)"
-			IntermediateDirectory="x86\TestZlibDll$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE"
-				StringPooling="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib"
-				OutputFile="$(OutDir)/testzlib.exe"
-				LinkIncremental="1"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="x64\TestZlibDll$(ConfigurationName)"
-			IntermediateDirectory="x64\TestZlibDll$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib"
-				OutputFile="$(OutDir)/testzlib.exe"
-				LinkIncremental="2"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Itanium"
-			OutputDirectory="ia64\TestZlibDll$(ConfigurationName)"
-			IntermediateDirectory="ia64\TestZlibDll$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="2"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib"
-				OutputFile="$(OutDir)/testzlib.exe"
-				LinkIncremental="2"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
-				SubSystem="1"
-				TargetMachine="5"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="x64\TestZlibDll$(ConfigurationName)"
-			IntermediateDirectory="x64\TestZlibDll$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"
-				StringPooling="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="x64\ZlibDllRelease\zlibwapi.lib"
-				OutputFile="$(OutDir)/testzlib.exe"
-				LinkIncremental="1"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Itanium"
-			OutputDirectory="ia64\TestZlibDll$(ConfigurationName)"
-			IntermediateDirectory="ia64\TestZlibDll$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="2"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"
-				StringPooling="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ia64\ZlibDllRelease\zlibwapi.lib"
-				OutputFile="$(OutDir)/testzlib.exe"
-				LinkIncremental="1"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="5"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
-			>
-			<File
-				RelativePath="..\..\testzlib\testzlib.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc9/zlib.rc b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc9/zlib.rc
deleted file mode 100644
index c4e4b01..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc9/zlib.rc
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <windows.h>
-
-#define IDR_VERSION1  1
-IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1, 2, 11, 0
-  PRODUCTVERSION 1, 2, 11, 0
-  FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
-  FILEFLAGS	0
-  FILEOS	VOS_DOS_WINDOWS32
-  FILETYPE	VFT_DLL
-  FILESUBTYPE	0	// not used
-BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-    BLOCK "040904E4"
-    //language ID = U.S. English, char set = Windows, Multilingual
-
-    BEGIN
-      VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.2.11\0"
-      VALUE "InternalName",	"zlib\0"
-      VALUE "OriginalFilename",	"zlibwapi.dll\0"
-      VALUE "ProductName",	"ZLib.DLL\0"
-      VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
-    END
-  END
-  BLOCK "VarFileInfo"
-  BEGIN
-    VALUE "Translation", 0x0409, 1252
-  END
-END
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc9/zlibstat.vcproj b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc9/zlibstat.vcproj
deleted file mode 100644
index d4ffb46..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc9/zlibstat.vcproj
+++ /dev/null
@@ -1,835 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="zlibstat"
-	ProjectGUID="{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-		<Platform
-			Name="Itanium"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="x86\ZlibStat$(ConfigurationName)"
-			IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp"
-			ConfigurationType="4"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
-				ExceptionHandling="0"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="false"
-				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB"
-				OutputFile="$(OutDir)\zlibstat.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="x64\ZlibStat$(ConfigurationName)"
-			IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp"
-			ConfigurationType="4"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
-				ExceptionHandling="0"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="false"
-				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB"
-				OutputFile="$(OutDir)\zlibstat.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Itanium"
-			OutputDirectory="ia64\ZlibStat$(ConfigurationName)"
-			IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp"
-			ConfigurationType="4"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="2"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
-				ExceptionHandling="0"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="false"
-				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB"
-				OutputFile="$(OutDir)\zlibstat.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="x86\ZlibStat$(ConfigurationName)"
-			IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp"
-			ConfigurationType="4"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB"
-				AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj "
-				OutputFile="$(OutDir)\zlibstat.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="x64\ZlibStat$(ConfigurationName)"
-			IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp"
-			ConfigurationType="4"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB"
-				AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "
-				OutputFile="$(OutDir)\zlibstat.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Itanium"
-			OutputDirectory="ia64\ZlibStat$(ConfigurationName)"
-			IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp"
-			ConfigurationType="4"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="2"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB"
-				OutputFile="$(OutDir)\zlibstat.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseWithoutAsm|Win32"
-			OutputDirectory="x86\ZlibStat$(ConfigurationName)"
-			IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp"
-			ConfigurationType="4"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB"
-				OutputFile="$(OutDir)\zlibstat.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseWithoutAsm|x64"
-			OutputDirectory="x64\ZlibStat$(ConfigurationName)"
-			IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp"
-			ConfigurationType="4"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB"
-				OutputFile="$(OutDir)\zlibstat.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseWithoutAsm|Itanium"
-			OutputDirectory="ia64\ZlibStat$(ConfigurationName)"
-			IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp"
-			ConfigurationType="4"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="2"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB"
-				OutputFile="$(OutDir)\zlibstat.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			>
-			<File
-				RelativePath="..\..\..\adler32.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compress.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\crc32.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\deflate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gzclose.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gzguts.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gzlib.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gzread.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gzwrite.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\infback.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\masmx64\inffas8664.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Itanium"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Itanium"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseWithoutAsm|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseWithoutAsm|Itanium"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\inffast.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\inflate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\inftrees.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\minizip\ioapi.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\trees.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\uncompr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\minizip\unzip.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\minizip\zip.c"
-				>
-			</File>
-			<File
-				RelativePath=".\zlib.rc"
-				>
-			</File>
-			<File
-				RelativePath=".\zlibvc.def"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\zutil.c"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc9/zlibvc.def b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc9/zlibvc.def
deleted file mode 100644
index f876c3b..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc9/zlibvc.def
+++ /dev/null
@@ -1,153 +0,0 @@
-LIBRARY
-; zlib data compression and ZIP file I/O library
-
-VERSION		1.2
-
-EXPORTS
-        adler32                                  @1
-        compress                                 @2
-        crc32                                    @3
-        deflate                                  @4
-        deflateCopy                              @5
-        deflateEnd                               @6
-        deflateInit2_                            @7
-        deflateInit_                             @8
-        deflateParams                            @9
-        deflateReset                             @10
-        deflateSetDictionary                     @11
-        gzclose                                  @12
-        gzdopen                                  @13
-        gzerror                                  @14
-        gzflush                                  @15
-        gzopen                                   @16
-        gzread                                   @17
-        gzwrite                                  @18
-        inflate                                  @19
-        inflateEnd                               @20
-        inflateInit2_                            @21
-        inflateInit_                             @22
-        inflateReset                             @23
-        inflateSetDictionary                     @24
-        inflateSync                              @25
-        uncompress                               @26
-        zlibVersion                              @27
-        gzprintf                                 @28
-        gzputc                                   @29
-        gzgetc                                   @30
-        gzseek                                   @31
-        gzrewind                                 @32
-        gztell                                   @33
-        gzeof                                    @34
-        gzsetparams                              @35
-        zError                                   @36
-        inflateSyncPoint                         @37
-        get_crc_table                            @38
-        compress2                                @39
-        gzputs                                   @40
-        gzgets                                   @41
-        inflateCopy                              @42
-        inflateBackInit_                         @43
-        inflateBack                              @44
-        inflateBackEnd                           @45
-        compressBound                            @46
-        deflateBound                             @47
-        gzclearerr                               @48
-        gzungetc                                 @49
-        zlibCompileFlags                         @50
-        deflatePrime                             @51
-        deflatePending                           @52
-
-        unzOpen                                  @61
-        unzClose                                 @62
-        unzGetGlobalInfo                         @63
-        unzGetCurrentFileInfo                    @64
-        unzGoToFirstFile                         @65
-        unzGoToNextFile                          @66
-        unzOpenCurrentFile                       @67
-        unzReadCurrentFile                       @68
-        unzOpenCurrentFile3                      @69
-        unztell                                  @70
-        unzeof                                   @71
-        unzCloseCurrentFile                      @72
-        unzGetGlobalComment                      @73
-        unzStringFileNameCompare                 @74
-        unzLocateFile                            @75
-        unzGetLocalExtrafield                    @76
-        unzOpen2                                 @77
-        unzOpenCurrentFile2                      @78
-        unzOpenCurrentFilePassword               @79
-
-        zipOpen                                  @80
-        zipOpenNewFileInZip                      @81
-        zipWriteInFileInZip                      @82
-        zipCloseFileInZip                        @83
-        zipClose                                 @84
-        zipOpenNewFileInZip2                     @86
-        zipCloseFileInZipRaw                     @87
-        zipOpen2                                 @88
-        zipOpenNewFileInZip3                     @89
-
-        unzGetFilePos                            @100
-        unzGoToFilePos                           @101
-
-        fill_win32_filefunc                      @110
-
-; zlibwapi v1.2.4 added:
-        fill_win32_filefunc64                   @111
-        fill_win32_filefunc64A                  @112
-        fill_win32_filefunc64W                  @113
-
-        unzOpen64                               @120
-        unzOpen2_64                             @121
-        unzGetGlobalInfo64                      @122
-        unzGetCurrentFileInfo64                 @124
-        unzGetCurrentFileZStreamPos64           @125
-        unztell64                               @126
-        unzGetFilePos64                         @127
-        unzGoToFilePos64                        @128
-
-        zipOpen64                               @130
-        zipOpen2_64                             @131
-        zipOpenNewFileInZip64                   @132
-        zipOpenNewFileInZip2_64                 @133
-        zipOpenNewFileInZip3_64                 @134
-        zipOpenNewFileInZip4_64                 @135
-        zipCloseFileInZipRaw64                  @136
-
-; zlib1 v1.2.4 added:
-        adler32_combine                         @140
-        crc32_combine                           @142
-        deflateSetHeader                        @144
-        deflateTune                             @145
-        gzbuffer                                @146
-        gzclose_r                               @147
-        gzclose_w                               @148
-        gzdirect                                @149
-        gzoffset                                @150
-        inflateGetHeader                        @156
-        inflateMark                             @157
-        inflatePrime                            @158
-        inflateReset2                           @159
-        inflateUndermine                        @160
-
-; zlib1 v1.2.6 added:
-        gzgetc_                                 @161
-        inflateResetKeep                        @163
-        deflateResetKeep                        @164
-
-; zlib1 v1.2.7 added:
-        gzopen_w                                @165
-
-; zlib1 v1.2.8 added:
-        inflateGetDictionary                    @166
-        gzvprintf                               @167
-
-; zlib1 v1.2.9 added:
-        inflateCodesUsed                        @168
-        inflateValidate                         @169
-        uncompress2                             @170
-        gzfread                                 @171
-        gzfwrite                                @172
-        deflateGetDictionary                    @173
-        adler32_z                               @174
-        crc32_z                                 @175
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc9/zlibvc.sln b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc9/zlibvc.sln
deleted file mode 100644
index 75c64c3..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc9/zlibvc.sln
+++ /dev/null
@@ -1,144 +0,0 @@
-锘�
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib", "testzlib.vcproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestZlibDll", "testzlibdll.vcproj", "{C52F9E7B-498A-42BE-8DB4-85A15694366A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D} = {8FD826F8-3739-44E6-8CC8-997122E53B8D}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcproj", "{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D} = {8FD826F8-3739-44E6-8CC8-997122E53B8D}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D} = {8FD826F8-3739-44E6-8CC8-997122E53B8D}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Itanium = Debug|Itanium
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Itanium = Release|Itanium
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-		ReleaseWithoutAsm|Itanium = ReleaseWithoutAsm|Itanium
-		ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32
-		ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.ActiveCfg = Debug|Itanium
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.Build.0 = Debug|Itanium
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.ActiveCfg = Debug|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.Build.0 = Debug|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.ActiveCfg = Release|Itanium
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.Build.0 = Release|Itanium
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = Release|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = Release|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.ActiveCfg = Debug|Itanium
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.Build.0 = Debug|Itanium
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.ActiveCfg = Release|Itanium
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.Build.0 = Release|Itanium
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Itanium
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.Build.0 = Debug|Itanium
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Itanium
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.Build.0 = Release|Itanium
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.ActiveCfg = Debug|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.Build.0 = Debug|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.Build.0 = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.ActiveCfg = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.Build.0 = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.ActiveCfg = Release|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.Build.0 = Release|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.Build.0 = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.Build.0 = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Itanium
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.Build.0 = Debug|Itanium
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Itanium
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.Build.0 = Release|Itanium
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.ActiveCfg = Debug|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.Build.0 = Debug|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.Build.0 = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.ActiveCfg = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.Build.0 = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.ActiveCfg = Release|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.Build.0 = Release|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.Build.0 = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.Build.0 = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc9/zlibvc.vcproj b/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc9/zlibvc.vcproj
deleted file mode 100644
index 95bb241..0000000
--- a/insDavi2.0/3psw/zlib-1.2.11/contrib/vstudio/vc9/zlibvc.vcproj
+++ /dev/null
@@ -1,1156 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="zlibvc"
-	ProjectGUID="{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
-	RootNamespace="zlibvc"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-		<Platform
-			Name="Itanium"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="x86\ZlibDll$(ConfigurationName)"
-			IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp"
-			ConfigurationType="2"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="$(OutDir)/zlibvc.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF"
-				ExceptionHandling="0"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="false"
-				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				BrowseInformation="0"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj"
-				OutputFile="$(OutDir)\zlibwapi.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="false"
-				ModuleDefinitionFile=".\zlibvc.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
-				GenerateMapFile="true"
-				MapFileName="$(OutDir)/zlibwapi.map"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)/zlibwapi.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="x64\ZlibDll$(ConfigurationName)"
-			IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp"
-			ConfigurationType="2"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName="$(OutDir)/zlibvc.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64"
-				ExceptionHandling="0"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="false"
-				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				BrowseInformation="0"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "
-				OutputFile="$(OutDir)\zlibwapi.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="false"
-				ModuleDefinitionFile=".\zlibvc.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
-				GenerateMapFile="true"
-				MapFileName="$(OutDir)/zlibwapi.map"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)/zlibwapi.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Itanium"
-			OutputDirectory="ia64\ZlibDll$(ConfigurationName)"
-			IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp"
-			ConfigurationType="2"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="2"
-				TypeLibraryName="$(OutDir)/zlibvc.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"
-				ExceptionHandling="0"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="false"
-				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				BrowseInformation="0"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\zlibwapi.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="false"
-				ModuleDefinitionFile=".\zlibvc.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
-				GenerateMapFile="true"
-				MapFileName="$(OutDir)/zlibwapi.map"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)/zlibwapi.lib"
-				TargetMachine="5"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseWithoutAsm|Win32"
-			OutputDirectory="x86\ZlibDll$(ConfigurationName)"
-			IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp"
-			ConfigurationType="2"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="$(OutDir)/zlibvc.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
-				AssemblerOutput="2"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				BrowseInformation="0"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				OutputFile="$(OutDir)\zlibwapi.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				GenerateManifest="false"
-				IgnoreAllDefaultLibraries="false"
-				ModuleDefinitionFile=".\zlibvc.def"
-				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
-				GenerateMapFile="true"
-				MapFileName="$(OutDir)/zlibwapi.map"
-				SubSystem="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)/zlibwapi.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseWithoutAsm|x64"
-			OutputDirectory="x64\ZlibDll$(ConfigurationName)"
-			IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp"
-			ConfigurationType="2"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName="$(OutDir)/zlibvc.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
-				AssemblerOutput="2"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				BrowseInformation="0"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\zlibwapi.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				GenerateManifest="false"
-				IgnoreAllDefaultLibraries="false"
-				ModuleDefinitionFile=".\zlibvc.def"
-				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
-				GenerateMapFile="true"
-				MapFileName="$(OutDir)/zlibwapi.map"
-				SubSystem="2"
-				OptimizeForWindows98="1"
-				ImportLibrary="$(OutDir)/zlibwapi.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseWithoutAsm|Itanium"
-			OutputDirectory="ia64\ZlibDll$(ConfigurationName)"
-			IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp"
-			ConfigurationType="2"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="2"
-				TypeLibraryName="$(OutDir)/zlibvc.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
-				AssemblerOutput="2"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				BrowseInformation="0"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\zlibwapi.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				GenerateManifest="false"
-				IgnoreAllDefaultLibraries="false"
-				ModuleDefinitionFile=".\zlibvc.def"
-				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
-				GenerateMapFile="true"
-				MapFileName="$(OutDir)/zlibwapi.map"
-				SubSystem="2"
-				OptimizeForWindows98="1"
-				ImportLibrary="$(OutDir)/zlibwapi.lib"
-				TargetMachine="5"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="x86\ZlibDll$(ConfigurationName)"
-			IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp"
-			ConfigurationType="2"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="$(OutDir)/zlibvc.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
-				AssemblerOutput="2"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				BrowseInformation="0"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj "
-				OutputFile="$(OutDir)\zlibwapi.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				GenerateManifest="false"
-				IgnoreAllDefaultLibraries="false"
-				ModuleDefinitionFile=".\zlibvc.def"
-				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
-				GenerateMapFile="true"
-				MapFileName="$(OutDir)/zlibwapi.map"
-				SubSystem="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)/zlibwapi.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="x64\ZlibDll$(ConfigurationName)"
-			IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp"
-			ConfigurationType="2"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName="$(OutDir)/zlibvc.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
-				AssemblerOutput="2"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				BrowseInformation="0"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "
-				OutputFile="$(OutDir)\zlibwapi.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				GenerateManifest="false"
-				IgnoreAllDefaultLibraries="false"
-				ModuleDefinitionFile=".\zlibvc.def"
-				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
-				GenerateMapFile="true"
-				MapFileName="$(OutDir)/zlibwapi.map"
-				SubSystem="2"
-				OptimizeForWindows98="1"
-				ImportLibrary="$(OutDir)/zlibwapi.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Itanium"
-			OutputDirectory="ia64\ZlibDll$(ConfigurationName)"
-			IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp"
-			ConfigurationType="2"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="2"
-				TypeLibraryName="$(OutDir)/zlibvc.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
-				AssemblerOutput="2"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				BrowseInformation="0"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\zlibwapi.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				GenerateManifest="false"
-				IgnoreAllDefaultLibraries="false"
-				ModuleDefinitionFile=".\zlibvc.def"
-				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
-				GenerateMapFile="true"
-				MapFileName="$(OutDir)/zlibwapi.map"
-				SubSystem="2"
-				OptimizeForWindows98="1"
-				ImportLibrary="$(OutDir)/zlibwapi.lib"
-				TargetMachine="5"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
-			>
-			<File
-				RelativePath="..\..\..\adler32.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compress.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\crc32.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\deflate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gzclose.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gzguts.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gzlib.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gzread.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gzwrite.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\infback.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\masmx64\inffas8664.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Itanium"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseWithoutAsm|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseWithoutAsm|Itanium"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Itanium"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\inffast.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\inflate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\inftrees.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\minizip\ioapi.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\minizip\iowin32.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\trees.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\uncompr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\minizip\unzip.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions="ZLIB_INTERNAL"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions="ZLIB_INTERNAL"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Itanium"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions="ZLIB_INTERNAL"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\minizip\zip.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions="ZLIB_INTERNAL"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions="ZLIB_INTERNAL"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Itanium"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions="ZLIB_INTERNAL"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\zlib.rc"
-				>
-			</File>
-			<File
-				RelativePath=".\zlibvc.def"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\zutil.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;fi;fd"
-			>
-			<File
-				RelativePath="..\..\..\deflate.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\infblock.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\infcodes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\inffast.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\inftrees.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\infutil.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\zconf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\zlib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\zutil.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/insDavi2.0/3psw/zlib-1.2.11/crc32.o b/insDavi2.0/3psw/zlib-1.2.11/crc32.o
deleted file mode 100644
index 1f8c0ed..0000000
Binary files a/insDavi2.0/3psw/zlib-1.2.11/crc32.o and /dev/null differ
diff --git a/insDavi2.0/3psw/zlib-1.2.11/deflate.o b/insDavi2.0/3psw/zlib-1.2.11/deflate.o
deleted file mode 100644
index 290479a..0000000
Binary files a/insDavi2.0/3psw/zlib-1.2.11/deflate.o and /dev/null differ
diff --git a/insDavi2.0/3psw/zlib-1.2.11/example.o b/insDavi2.0/3psw/zlib-1.2.11/example.o
deleted file mode 100644
index 564fc07..0000000
Binary files a/insDavi2.0/3psw/zlib-1.2.11/example.o and /dev/null differ
diff --git a/insDavi2.0/3psw/zlib-1.2.11/gzclose.o b/insDavi2.0/3psw/zlib-1.2.11/gzclose.o
deleted file mode 100644
index f262d4d..0000000
Binary files a/insDavi2.0/3psw/zlib-1.2.11/gzclose.o and /dev/null differ
diff --git a/insDavi2.0/3psw/zlib-1.2.11/gzlib.o b/insDavi2.0/3psw/zlib-1.2.11/gzlib.o
deleted file mode 100644
index 5e8b9b9..0000000
Binary files a/insDavi2.0/3psw/zlib-1.2.11/gzlib.o and /dev/null differ
diff --git a/insDavi2.0/3psw/zlib-1.2.11/gzread.o b/insDavi2.0/3psw/zlib-1.2.11/gzread.o
deleted file mode 100644
index 09a2ced..0000000
Binary files a/insDavi2.0/3psw/zlib-1.2.11/gzread.o and /dev/null differ
diff --git a/insDavi2.0/3psw/zlib-1.2.11/gzwrite.o b/insDavi2.0/3psw/zlib-1.2.11/gzwrite.o
deleted file mode 100644
index 2992b1b..0000000
Binary files a/insDavi2.0/3psw/zlib-1.2.11/gzwrite.o and /dev/null differ
diff --git a/insDavi2.0/3psw/zlib-1.2.11/infback.o b/insDavi2.0/3psw/zlib-1.2.11/infback.o
deleted file mode 100644
index 61d6ca9..0000000
Binary files a/insDavi2.0/3psw/zlib-1.2.11/infback.o and /dev/null differ
diff --git a/insDavi2.0/3psw/zlib-1.2.11/inffast.o b/insDavi2.0/3psw/zlib-1.2.11/inffast.o
deleted file mode 100644
index 9b8bb29..0000000
Binary files a/insDavi2.0/3psw/zlib-1.2.11/inffast.o and /dev/null differ
diff --git a/insDavi2.0/3psw/zlib-1.2.11/inflate.o b/insDavi2.0/3psw/zlib-1.2.11/inflate.o
deleted file mode 100644
index 04943ec..0000000
Binary files a/insDavi2.0/3psw/zlib-1.2.11/inflate.o and /dev/null differ
diff --git a/insDavi2.0/3psw/zlib-1.2.11/inftrees.o b/insDavi2.0/3psw/zlib-1.2.11/inftrees.o
deleted file mode 100644
index d728310..0000000
Binary files a/insDavi2.0/3psw/zlib-1.2.11/inftrees.o and /dev/null differ
diff --git a/insDavi2.0/3psw/zlib-1.2.11/minigzip.o b/insDavi2.0/3psw/zlib-1.2.11/minigzip.o
deleted file mode 100644
index ea54272..0000000
Binary files a/insDavi2.0/3psw/zlib-1.2.11/minigzip.o and /dev/null differ
diff --git a/insDavi2.0/3psw/zlib-1.2.11/trees.o b/insDavi2.0/3psw/zlib-1.2.11/trees.o
deleted file mode 100644
index e8c2266..0000000
Binary files a/insDavi2.0/3psw/zlib-1.2.11/trees.o and /dev/null differ
diff --git a/insDavi2.0/3psw/zlib-1.2.11/uncompr.o b/insDavi2.0/3psw/zlib-1.2.11/uncompr.o
deleted file mode 100644
index b34d74a..0000000
Binary files a/insDavi2.0/3psw/zlib-1.2.11/uncompr.o and /dev/null differ
diff --git a/insDavi2.0/3psw/zlib-1.2.11/zlibrc.o b/insDavi2.0/3psw/zlib-1.2.11/zlibrc.o
deleted file mode 100644
index 86f2fce..0000000
Binary files a/insDavi2.0/3psw/zlib-1.2.11/zlibrc.o and /dev/null differ
diff --git a/insDavi2.0/3psw/zlib-1.2.11/zutil.o b/insDavi2.0/3psw/zlib-1.2.11/zutil.o
deleted file mode 100644
index 038537a..0000000
Binary files a/insDavi2.0/3psw/zlib-1.2.11/zutil.o and /dev/null differ
diff --git a/insDavi2.0/Res/model3d/bicycle_1.vbo b/insDavi2.0/Res/model3d/bicycle_1.vbo
deleted file mode 100644
index 62aaf18..0000000
Binary files a/insDavi2.0/Res/model3d/bicycle_1.vbo and /dev/null differ
diff --git a/insDavi2.0/Res/model3d/car_1.vbo b/insDavi2.0/Res/model3d/car_1.vbo
deleted file mode 100644
index 66d0dd2..0000000
Binary files a/insDavi2.0/Res/model3d/car_1.vbo and /dev/null differ
diff --git a/insDavi2.0/Res/model3d/truck_1.vbo b/insDavi2.0/Res/model3d/truck_1.vbo
deleted file mode 100644
index 36da4d7..0000000
Binary files a/insDavi2.0/Res/model3d/truck_1.vbo and /dev/null differ
diff --git a/insDavi2.0/bin/instApp b/insDavi2.0/bin/instApp
deleted file mode 100644
index fb3b699..0000000
Binary files a/insDavi2.0/bin/instApp and /dev/null differ
diff --git a/insDavi2.0/main.d b/insDavi2.0/main.d
deleted file mode 100644
index 22e7972..0000000
--- a/insDavi2.0/main.d
+++ /dev/null
@@ -1,52 +0,0 @@
-main.o: main.c \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/stdio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/features.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/cdefs.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/wordsize.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/gnu/stubs.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stddef.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/types.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/typesizes.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/libio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/_G_config.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/wchar.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stdarg.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/stdio_lim.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sys_errlist.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/stdio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/stdlib.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/waitflags.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/waitstatus.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/endian.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/endian.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/byteswap.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/types.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/time.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/select.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/select.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sigset.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/time.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/sysmacros.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/pthreadtypes.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/alloca.h \
- include/BaseTypes.h include/InsTask/MainBoardCommunication.h \
- include/InsTask.h include/InsTask/ResourceLoader.h \
- include/InsTask/DisplayRender.h include/InsTask/CduCommunication.h \
- include/InsRender.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/unistd.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/posix_opt.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/environments.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/confname.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/getopt.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/signal.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/signum.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/siginfo.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sigaction.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sigcontext.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm/sigcontext.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sigstack.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/ucontext.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/procfs.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/time.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/user.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sigthread.h
diff --git a/insDavi2.0/main.o b/insDavi2.0/main.o
deleted file mode 100644
index 65f6f0d..0000000
Binary files a/insDavi2.0/main.o and /dev/null differ
diff --git a/insDavi2.0/obj/Debug/main.o b/insDavi2.0/obj/Debug/main.o
deleted file mode 100644
index 1c0de1e..0000000
Binary files a/insDavi2.0/obj/Debug/main.o and /dev/null differ
diff --git a/insDavi2.0/obj/Debug/src/InsRender/Render.o b/insDavi2.0/obj/Debug/src/InsRender/Render.o
deleted file mode 100644
index 258f8fe..0000000
Binary files a/insDavi2.0/obj/Debug/src/InsRender/Render.o and /dev/null differ
diff --git a/insDavi2.0/obj/Debug/src/InsRender/RenderUtils.o b/insDavi2.0/obj/Debug/src/InsRender/RenderUtils.o
deleted file mode 100644
index faec05d..0000000
Binary files a/insDavi2.0/obj/Debug/src/InsRender/RenderUtils.o and /dev/null differ
diff --git a/insDavi2.0/obj/Debug/src/InsRender/Res_TxtBasic.o b/insDavi2.0/obj/Debug/src/InsRender/Res_TxtBasic.o
deleted file mode 100644
index a602fb3..0000000
Binary files a/insDavi2.0/obj/Debug/src/InsRender/Res_TxtBasic.o and /dev/null differ
diff --git a/insDavi2.0/obj/Debug/src/InsRender/Res_TxtHintAlarm.o b/insDavi2.0/obj/Debug/src/InsRender/Res_TxtHintAlarm.o
deleted file mode 100644
index ed9ccd7..0000000
Binary files a/insDavi2.0/obj/Debug/src/InsRender/Res_TxtHintAlarm.o and /dev/null differ
diff --git a/insDavi2.0/obj/Debug/src/InsTask/CduCommunication.o b/insDavi2.0/obj/Debug/src/InsTask/CduCommunication.o
deleted file mode 100644
index df2338d..0000000
Binary files a/insDavi2.0/obj/Debug/src/InsTask/CduCommunication.o and /dev/null differ
diff --git a/insDavi2.0/obj/Debug/src/InsTask/DisplayRender.o b/insDavi2.0/obj/Debug/src/InsTask/DisplayRender.o
deleted file mode 100644
index 2574d07..0000000
Binary files a/insDavi2.0/obj/Debug/src/InsTask/DisplayRender.o and /dev/null differ
diff --git a/insDavi2.0/obj/Debug/src/InsTask/MainBoardCommunication.o b/insDavi2.0/obj/Debug/src/InsTask/MainBoardCommunication.o
deleted file mode 100644
index 3c5a28a..0000000
Binary files a/insDavi2.0/obj/Debug/src/InsTask/MainBoardCommunication.o and /dev/null differ
diff --git a/insDavi2.0/obj/Debug/src/InsTask/ResourceLoader.o b/insDavi2.0/obj/Debug/src/InsTask/ResourceLoader.o
deleted file mode 100644
index 649242f..0000000
Binary files a/insDavi2.0/obj/Debug/src/InsTask/ResourceLoader.o and /dev/null differ
diff --git a/insDavi2.0/obj/Debug/src/InsTask/utils_i2c.o b/insDavi2.0/obj/Debug/src/InsTask/utils_i2c.o
deleted file mode 100644
index a904177..0000000
Binary files a/insDavi2.0/obj/Debug/src/InsTask/utils_i2c.o and /dev/null differ
diff --git a/insDavi2.0/obj/Debug/src/Protocol/Cdu_TCP.o b/insDavi2.0/obj/Debug/src/Protocol/Cdu_TCP.o
deleted file mode 100644
index b862770..0000000
Binary files a/insDavi2.0/obj/Debug/src/Protocol/Cdu_TCP.o and /dev/null differ
diff --git a/insDavi2.0/obj/Debug/src/Protocol/MainBoard_IIC.o b/insDavi2.0/obj/Debug/src/Protocol/MainBoard_IIC.o
deleted file mode 100644
index 22c8bbd..0000000
Binary files a/insDavi2.0/obj/Debug/src/Protocol/MainBoard_IIC.o and /dev/null differ
diff --git a/insDavi2.0/obj/Debug/src/lib/InsFont.o b/insDavi2.0/obj/Debug/src/lib/InsFont.o
deleted file mode 100644
index f51fa14..0000000
Binary files a/insDavi2.0/obj/Debug/src/lib/InsFont.o and /dev/null differ
diff --git a/insDavi2.0/obj/Debug/src/lib/InsGL.o b/insDavi2.0/obj/Debug/src/lib/InsGL.o
deleted file mode 100644
index 84309ea..0000000
Binary files a/insDavi2.0/obj/Debug/src/lib/InsGL.o and /dev/null differ
diff --git a/insDavi2.0/obj/Debug/src/lib/InsJpeg.o b/insDavi2.0/obj/Debug/src/lib/InsJpeg.o
deleted file mode 100644
index ca6526b..0000000
Binary files a/insDavi2.0/obj/Debug/src/lib/InsJpeg.o and /dev/null differ
diff --git a/insDavi2.0/obj/Debug/src/lib/InsMatrix.o b/insDavi2.0/obj/Debug/src/lib/InsMatrix.o
deleted file mode 100644
index 67a47b6..0000000
Binary files a/insDavi2.0/obj/Debug/src/lib/InsMatrix.o and /dev/null differ
diff --git a/insDavi2.0/obj/Debug/src/lib/InsPng.o b/insDavi2.0/obj/Debug/src/lib/InsPng.o
deleted file mode 100644
index 06f3646..0000000
Binary files a/insDavi2.0/obj/Debug/src/lib/InsPng.o and /dev/null differ
diff --git a/insDavi2.0/obj/Debug/src/lib/InsQueue.o b/insDavi2.0/obj/Debug/src/lib/InsQueue.o
deleted file mode 100644
index 09dc59a..0000000
Binary files a/insDavi2.0/obj/Debug/src/lib/InsQueue.o and /dev/null differ
diff --git a/insDavi2.0/obj/Release/main.o b/insDavi2.0/obj/Release/main.o
deleted file mode 100644
index a13352c..0000000
Binary files a/insDavi2.0/obj/Release/main.o and /dev/null differ
diff --git a/insDavi2.0/obj/Release/src/InsRender/Render.o b/insDavi2.0/obj/Release/src/InsRender/Render.o
deleted file mode 100644
index cd44977..0000000
Binary files a/insDavi2.0/obj/Release/src/InsRender/Render.o and /dev/null differ
diff --git a/insDavi2.0/obj/Release/src/InsRender/RenderUtils.o b/insDavi2.0/obj/Release/src/InsRender/RenderUtils.o
deleted file mode 100644
index d0601dc..0000000
Binary files a/insDavi2.0/obj/Release/src/InsRender/RenderUtils.o and /dev/null differ
diff --git a/insDavi2.0/obj/Release/src/InsRender/Res_TxtBasic.o b/insDavi2.0/obj/Release/src/InsRender/Res_TxtBasic.o
deleted file mode 100644
index 51c1677..0000000
Binary files a/insDavi2.0/obj/Release/src/InsRender/Res_TxtBasic.o and /dev/null differ
diff --git a/insDavi2.0/obj/Release/src/InsRender/Res_TxtHintAlarm.o b/insDavi2.0/obj/Release/src/InsRender/Res_TxtHintAlarm.o
deleted file mode 100644
index 2a2d8a3..0000000
Binary files a/insDavi2.0/obj/Release/src/InsRender/Res_TxtHintAlarm.o and /dev/null differ
diff --git a/insDavi2.0/obj/Release/src/InsTask/CduCommunication.o b/insDavi2.0/obj/Release/src/InsTask/CduCommunication.o
deleted file mode 100644
index d4c191e..0000000
Binary files a/insDavi2.0/obj/Release/src/InsTask/CduCommunication.o and /dev/null differ
diff --git a/insDavi2.0/obj/Release/src/InsTask/DisplayRender.o b/insDavi2.0/obj/Release/src/InsTask/DisplayRender.o
deleted file mode 100644
index 2367c9c..0000000
Binary files a/insDavi2.0/obj/Release/src/InsTask/DisplayRender.o and /dev/null differ
diff --git a/insDavi2.0/obj/Release/src/InsTask/MainBoardCommunication.o b/insDavi2.0/obj/Release/src/InsTask/MainBoardCommunication.o
deleted file mode 100644
index 8a1dffb..0000000
Binary files a/insDavi2.0/obj/Release/src/InsTask/MainBoardCommunication.o and /dev/null differ
diff --git a/insDavi2.0/obj/Release/src/InsTask/ResourceLoader.o b/insDavi2.0/obj/Release/src/InsTask/ResourceLoader.o
deleted file mode 100644
index 61111e9..0000000
Binary files a/insDavi2.0/obj/Release/src/InsTask/ResourceLoader.o and /dev/null differ
diff --git a/insDavi2.0/obj/Release/src/InsTask/utils_i2c.o b/insDavi2.0/obj/Release/src/InsTask/utils_i2c.o
deleted file mode 100644
index 591da3a..0000000
Binary files a/insDavi2.0/obj/Release/src/InsTask/utils_i2c.o and /dev/null differ
diff --git a/insDavi2.0/obj/Release/src/Protocol/Cdu_TCP.o b/insDavi2.0/obj/Release/src/Protocol/Cdu_TCP.o
deleted file mode 100644
index 793b0fd..0000000
Binary files a/insDavi2.0/obj/Release/src/Protocol/Cdu_TCP.o and /dev/null differ
diff --git a/insDavi2.0/obj/Release/src/Protocol/MainBoard_IIC.o b/insDavi2.0/obj/Release/src/Protocol/MainBoard_IIC.o
deleted file mode 100644
index 52bc31a..0000000
Binary files a/insDavi2.0/obj/Release/src/Protocol/MainBoard_IIC.o and /dev/null differ
diff --git a/insDavi2.0/obj/Release/src/lib/InsFont.o b/insDavi2.0/obj/Release/src/lib/InsFont.o
deleted file mode 100644
index 1347c77..0000000
Binary files a/insDavi2.0/obj/Release/src/lib/InsFont.o and /dev/null differ
diff --git a/insDavi2.0/obj/Release/src/lib/InsGL.o b/insDavi2.0/obj/Release/src/lib/InsGL.o
deleted file mode 100644
index c7fdfc9..0000000
Binary files a/insDavi2.0/obj/Release/src/lib/InsGL.o and /dev/null differ
diff --git a/insDavi2.0/obj/Release/src/lib/InsJpeg.o b/insDavi2.0/obj/Release/src/lib/InsJpeg.o
deleted file mode 100644
index 04ae601..0000000
Binary files a/insDavi2.0/obj/Release/src/lib/InsJpeg.o and /dev/null differ
diff --git a/insDavi2.0/obj/Release/src/lib/InsMatrix.o b/insDavi2.0/obj/Release/src/lib/InsMatrix.o
deleted file mode 100644
index afc3f60..0000000
Binary files a/insDavi2.0/obj/Release/src/lib/InsMatrix.o and /dev/null differ
diff --git a/insDavi2.0/obj/Release/src/lib/InsPng.o b/insDavi2.0/obj/Release/src/lib/InsPng.o
deleted file mode 100644
index b37f87a..0000000
Binary files a/insDavi2.0/obj/Release/src/lib/InsPng.o and /dev/null differ
diff --git a/insDavi2.0/obj/Release/src/lib/InsQueue.o b/insDavi2.0/obj/Release/src/lib/InsQueue.o
deleted file mode 100644
index c984b28..0000000
Binary files a/insDavi2.0/obj/Release/src/lib/InsQueue.o and /dev/null differ
diff --git a/insDavi2.0/src/InsRender/Render.d b/insDavi2.0/src/InsRender/Render.d
deleted file mode 100644
index cc1face..0000000
--- a/insDavi2.0/src/InsRender/Render.d
+++ /dev/null
@@ -1,79 +0,0 @@
-src/InsRender/Render.o: src/InsRender/Render.c \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/stdio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/features.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/cdefs.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/wordsize.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/gnu/stubs.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stddef.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/types.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/typesizes.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/libio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/_G_config.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/wchar.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stdarg.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/stdio_lim.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sys_errlist.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/stdio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/stdlib.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/waitflags.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/waitstatus.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/endian.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/endian.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/byteswap.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/types.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/time.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/select.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/select.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sigset.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/time.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/sysmacros.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/pthreadtypes.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/alloca.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/math.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/huge_val.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/huge_valf.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/huge_vall.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/inf.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/nan.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/mathdef.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/mathcalls.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/mathinline.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/string.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/xlocale.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/string.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/string2.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/time.h \
- include/lib/InsGL.h include/BaseTypes.h include/lib/InsFont.h \
- include/lib/InsMatrix.h include/InsCfg.h \
- /home/lst/workspace/rootfs//usr/include/GLES2/gl2.h \
- /home/lst/workspace/rootfs//usr/include/GLES2/gl2platform.h \
- /home/lst/workspace/rootfs//usr/include/KHR/khrplatform.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stdint.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/stdint.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/wchar.h \
- /home/lst/workspace/rootfs//usr/include/GLES2/gl2rename.h \
- /home/lst/workspace/rootfs//usr/include/GLES2/gl2ext.h \
- include/InsTask/DisplayRender.h include/InsTask.h \
- include/Protocol/MainBoard_IIC_App.h include/Protocol/MainBoard_IIC.h \
- include/Protocol/Cdu_TCP_App.h include/Protocol/Cdu_TCP.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/socket.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/uio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/uio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/socket.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sockaddr.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm/socket.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm/sockios.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/arpa/inet.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/netinet/in.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/in.h \
- include/InsTask/ResourceLoader.h include/InsDbg.h \
- src/InsRender/RenderUtils.h src/InsRender/Res_Font.h \
- src/InsRender/Res_Shader.h src/InsRender/Res_Png.h include/lib/InsPng.h \
- src/InsRender/Res_Tga.h src/InsRender/Res_BmpPool.h \
- src/InsRender/Res_TxtBasic.h src/InsRender/Res_TxtHintAlarm.h \
- src/InsRender/Res_Model.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/unistd.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/posix_opt.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/environments.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/confname.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/getopt.h
diff --git a/insDavi2.0/src/InsRender/Render.o b/insDavi2.0/src/InsRender/Render.o
deleted file mode 100644
index bed458c..0000000
Binary files a/insDavi2.0/src/InsRender/Render.o and /dev/null differ
diff --git a/insDavi2.0/src/InsRender/RenderUtils.d b/insDavi2.0/src/InsRender/RenderUtils.d
deleted file mode 100644
index c4ca35f..0000000
--- a/insDavi2.0/src/InsRender/RenderUtils.d
+++ /dev/null
@@ -1,53 +0,0 @@
-src/InsRender/RenderUtils.o: src/InsRender/RenderUtils.c \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/math.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/features.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/cdefs.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/wordsize.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/gnu/stubs.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/huge_val.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/huge_valf.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/huge_vall.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/inf.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/nan.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/mathdef.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/mathcalls.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/mathinline.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/stdio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stddef.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/types.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/typesizes.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/libio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/_G_config.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/wchar.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stdarg.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/stdio_lim.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sys_errlist.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/stdio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/stdlib.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/waitflags.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/waitstatus.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/endian.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/endian.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/byteswap.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/types.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/time.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/select.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/select.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sigset.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/time.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/sysmacros.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/pthreadtypes.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/alloca.h \
- src/InsRender/RenderUtils.h include/InsCfg.h include/BaseTypes.h \
- /home/lst/workspace/rootfs//usr/include/GLES2/gl2.h \
- /home/lst/workspace/rootfs//usr/include/GLES2/gl2platform.h \
- /home/lst/workspace/rootfs//usr/include/KHR/khrplatform.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stdint.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/stdint.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/wchar.h \
- /home/lst/workspace/rootfs//usr/include/GLES2/gl2rename.h \
- /home/lst/workspace/rootfs//usr/include/GLES2/gl2ext.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/time.h \
- include/lib/InsMatrix.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/xlocale.h \
- include/InsDbg.h
diff --git a/insDavi2.0/src/InsRender/RenderUtils.o b/insDavi2.0/src/InsRender/RenderUtils.o
deleted file mode 100644
index a3d5f9e..0000000
Binary files a/insDavi2.0/src/InsRender/RenderUtils.o and /dev/null differ
diff --git a/insDavi2.0/src/InsRender/Res_Txt.d b/insDavi2.0/src/InsRender/Res_Txt.d
deleted file mode 100644
index f0e856d..0000000
--- a/insDavi2.0/src/InsRender/Res_Txt.d
+++ /dev/null
@@ -1 +0,0 @@
-src/InsRender/Res_Txt.o: src/InsRender/Res_Txt.c src/InsRender/Res_Txt.h
diff --git a/insDavi2.0/src/InsRender/Res_TxtBasic.d b/insDavi2.0/src/InsRender/Res_TxtBasic.d
deleted file mode 100644
index 4aa9d9f..0000000
--- a/insDavi2.0/src/InsRender/Res_TxtBasic.d
+++ /dev/null
@@ -1,2 +0,0 @@
-src/InsRender/Res_TxtBasic.o: src/InsRender/Res_TxtBasic.c \
- src/InsRender/Res_TxtBasic.h
diff --git a/insDavi2.0/src/InsRender/Res_TxtBasic.o b/insDavi2.0/src/InsRender/Res_TxtBasic.o
deleted file mode 100644
index 95d45f3..0000000
Binary files a/insDavi2.0/src/InsRender/Res_TxtBasic.o and /dev/null differ
diff --git a/insDavi2.0/src/InsRender/Res_TxtHintAlarm.d b/insDavi2.0/src/InsRender/Res_TxtHintAlarm.d
deleted file mode 100644
index 1aeedb7..0000000
--- a/insDavi2.0/src/InsRender/Res_TxtHintAlarm.d
+++ /dev/null
@@ -1,2 +0,0 @@
-src/InsRender/Res_TxtHintAlarm.o: src/InsRender/Res_TxtHintAlarm.c \
- src/InsRender/Res_TxtHintAlarm.h
diff --git a/insDavi2.0/src/InsRender/Res_TxtHintAlarm.o b/insDavi2.0/src/InsRender/Res_TxtHintAlarm.o
deleted file mode 100644
index d75823a..0000000
Binary files a/insDavi2.0/src/InsRender/Res_TxtHintAlarm.o and /dev/null differ
diff --git a/insDavi2.0/src/InsTask/CduCommunication.d b/insDavi2.0/src/InsTask/CduCommunication.d
deleted file mode 100644
index 041eb3e..0000000
--- a/insDavi2.0/src/InsTask/CduCommunication.d
+++ /dev/null
@@ -1,72 +0,0 @@
-src/InsTask/CduCommunication.o: src/InsTask/CduCommunication.c \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/stdio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/features.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/cdefs.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/wordsize.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/gnu/stubs.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stddef.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/types.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/typesizes.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/libio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/_G_config.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/wchar.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stdarg.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/stdio_lim.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sys_errlist.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/stdio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/stdlib.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/waitflags.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/waitstatus.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/endian.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/endian.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/byteswap.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/types.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/time.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/select.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/select.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sigset.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/time.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/sysmacros.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/pthreadtypes.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/alloca.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/pthread.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sched.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sched.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/xlocale.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/setjmp.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/semaphore.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/semaphore.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/unistd.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/posix_opt.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/environments.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/confname.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/getopt.h \
- include/InsCfg.h include/InsTask/CduCommunication.h include/InsTask.h \
- include/BaseTypes.h include/Protocol/Cdu_TCP.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/socket.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/uio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/uio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/socket.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sockaddr.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm/socket.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm/sockios.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/arpa/inet.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/netinet/in.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stdint.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/stdint.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/wchar.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/in.h \
- include/Protocol/Cdu_TCP_App.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/errno.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/errno.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/linux/errno.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm/errno.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm-generic/errno.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm-generic/errno-base.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/string.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/string.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/string2.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/fcntl.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/fcntl.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/stat.h \
- include/InsDbg.h
diff --git a/insDavi2.0/src/InsTask/CduCommunication.o b/insDavi2.0/src/InsTask/CduCommunication.o
deleted file mode 100644
index 1e4b33e..0000000
Binary files a/insDavi2.0/src/InsTask/CduCommunication.o and /dev/null differ
diff --git a/insDavi2.0/src/InsTask/DisplayRender.d b/insDavi2.0/src/InsTask/DisplayRender.d
deleted file mode 100644
index d5b4f0c..0000000
--- a/insDavi2.0/src/InsTask/DisplayRender.d
+++ /dev/null
@@ -1,36 +0,0 @@
-src/InsTask/DisplayRender.o: src/InsTask/DisplayRender.c \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/stdio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/features.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/cdefs.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/wordsize.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/gnu/stubs.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stddef.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/types.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/typesizes.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/libio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/_G_config.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/wchar.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stdarg.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/stdio_lim.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sys_errlist.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/stdio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/pthread.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/endian.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/endian.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/byteswap.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sched.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/time.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sched.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/time.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/xlocale.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/pthreadtypes.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/setjmp.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/semaphore.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/types.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/select.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/select.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sigset.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/sysmacros.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/semaphore.h \
- include/InsCfg.h include/InsTask/DisplayRender.h include/InsTask.h \
- include/BaseTypes.h include/lib/InsGL.h include/InsDbg.h
diff --git a/insDavi2.0/src/InsTask/DisplayRender.o b/insDavi2.0/src/InsTask/DisplayRender.o
deleted file mode 100644
index 7cd796f..0000000
Binary files a/insDavi2.0/src/InsTask/DisplayRender.o and /dev/null differ
diff --git a/insDavi2.0/src/InsTask/MainBoardCommunication.d b/insDavi2.0/src/InsTask/MainBoardCommunication.d
deleted file mode 100644
index e24cd3a..0000000
--- a/insDavi2.0/src/InsTask/MainBoardCommunication.d
+++ /dev/null
@@ -1,55 +0,0 @@
-src/InsTask/MainBoardCommunication.o: \
- src/InsTask/MainBoardCommunication.c \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/stdio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/features.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/cdefs.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/wordsize.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/gnu/stubs.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stddef.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/types.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/typesizes.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/libio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/_G_config.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/wchar.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stdarg.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/stdio_lim.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sys_errlist.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/stdio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/pthread.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/endian.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/endian.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/byteswap.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sched.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/time.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sched.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/time.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/xlocale.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/pthreadtypes.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/setjmp.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/semaphore.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/types.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/select.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/select.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sigset.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/sysmacros.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/semaphore.h \
- include/InsCfg.h include/InsTask/MainBoardCommunication.h \
- include/InsTask.h include/BaseTypes.h include/Protocol/MainBoard_IIC.h \
- include/Protocol/MainBoard_IIC_App.h \
- include/Protocol/MainBoard_IIC_Sys.h include/InsDbg.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/time.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/unistd.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/posix_opt.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/environments.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/confname.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/getopt.h \
- src/InsTask/utils_i2c.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/linux/i2c-dev.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/linux/types.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm/types.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm-generic/int-ll64.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm/bitsperlong.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm-generic/bitsperlong.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/linux/posix_types.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/linux/stddef.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm/posix_types.h
diff --git a/insDavi2.0/src/InsTask/MainBoardCommunication.o b/insDavi2.0/src/InsTask/MainBoardCommunication.o
deleted file mode 100644
index 5d345f1..0000000
Binary files a/insDavi2.0/src/InsTask/MainBoardCommunication.o and /dev/null differ
diff --git a/insDavi2.0/src/InsTask/ResourceLoader.d b/insDavi2.0/src/InsTask/ResourceLoader.d
deleted file mode 100644
index e7a8393..0000000
--- a/insDavi2.0/src/InsTask/ResourceLoader.d
+++ /dev/null
@@ -1,42 +0,0 @@
-src/InsTask/ResourceLoader.o: src/InsTask/ResourceLoader.c \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/stdio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/features.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/cdefs.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/wordsize.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/gnu/stubs.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stddef.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/types.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/typesizes.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/libio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/_G_config.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/wchar.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stdarg.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/stdio_lim.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sys_errlist.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/stdio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/pthread.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/endian.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/endian.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/byteswap.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sched.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/time.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sched.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/time.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/xlocale.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/pthreadtypes.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/setjmp.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/semaphore.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/types.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/select.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/select.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sigset.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/sysmacros.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/semaphore.h \
- include/InsDbg.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/unistd.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/posix_opt.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/environments.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/confname.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/getopt.h \
- include/InsCfg.h include/lib/InsQueue.h include/BaseTypes.h \
- include/InsTask/ResourceLoader.h include/InsTask.h
diff --git a/insDavi2.0/src/InsTask/ResourceLoader.o b/insDavi2.0/src/InsTask/ResourceLoader.o
deleted file mode 100644
index 7576e0a..0000000
Binary files a/insDavi2.0/src/InsTask/ResourceLoader.o and /dev/null differ
diff --git a/insDavi2.0/src/InsTask/utils_i2c.d b/insDavi2.0/src/InsTask/utils_i2c.d
deleted file mode 100644
index d928adf..0000000
--- a/insDavi2.0/src/InsTask/utils_i2c.d
+++ /dev/null
@@ -1,67 +0,0 @@
-src/InsTask/utils_i2c.o: src/InsTask/utils_i2c.c \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/stdio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/features.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/cdefs.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/wordsize.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/gnu/stubs.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stddef.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/types.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/typesizes.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/libio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/_G_config.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/wchar.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stdarg.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/stdio_lim.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sys_errlist.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/stdio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/stdlib.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/waitflags.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/waitstatus.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/endian.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/endian.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/byteswap.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/types.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/time.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/select.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/select.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sigset.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/time.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/sysmacros.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/pthreadtypes.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/alloca.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/ioctl.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/ioctls.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm/ioctls.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm-generic/ioctls.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/linux/ioctl.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm/ioctl.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm-generic/ioctl.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/ioctl-types.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/ttydefaults.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/stat.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/stat.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/fcntl.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/fcntl.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/unistd.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/posix_opt.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/environments.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/confname.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/getopt.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/errno.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/errno.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/linux/errno.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm/errno.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm-generic/errno.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm-generic/errno-base.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/linux/i2c.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/linux/types.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm/types.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm-generic/int-ll64.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm/bitsperlong.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm-generic/bitsperlong.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/linux/posix_types.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/linux/stddef.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm/posix_types.h \
- src/InsTask/utils_i2c.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/linux/i2c-dev.h \
- include/BaseTypes.h
diff --git a/insDavi2.0/src/InsTask/utils_i2c.o b/insDavi2.0/src/InsTask/utils_i2c.o
deleted file mode 100644
index 5727dc4..0000000
Binary files a/insDavi2.0/src/InsTask/utils_i2c.o and /dev/null differ
diff --git a/insDavi2.0/src/Protocol/Cdu_TCP.d b/insDavi2.0/src/Protocol/Cdu_TCP.d
deleted file mode 100644
index 47fa9e8..0000000
--- a/insDavi2.0/src/Protocol/Cdu_TCP.d
+++ /dev/null
@@ -1,63 +0,0 @@
-src/Protocol/Cdu_TCP.o: src/Protocol/Cdu_TCP.c \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/stdio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/features.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/cdefs.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/wordsize.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/gnu/stubs.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stddef.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/types.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/typesizes.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/libio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/_G_config.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/wchar.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stdarg.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/stdio_lim.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sys_errlist.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/stdio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/errno.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/errno.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/linux/errno.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm/errno.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm-generic/errno.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm-generic/errno-base.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/stdlib.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/waitflags.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/waitstatus.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/endian.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/endian.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/byteswap.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/types.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/time.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/select.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/select.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sigset.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/time.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/sysmacros.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/pthreadtypes.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/alloca.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/string.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/xlocale.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/string.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/string2.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/unistd.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/posix_opt.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/environments.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/confname.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/getopt.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/time.h \
- include/lib/cJSON.h include/lib/InsJpeg.h include/BaseTypes.h \
- include/lib/InsPng.h include/Protocol/Cdu_TCP.h include/InsCfg.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/socket.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/uio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/uio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/socket.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sockaddr.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm/socket.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm/sockios.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/arpa/inet.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/netinet/in.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stdint.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/stdint.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/wchar.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/in.h \
- include/Protocol/Cdu_TCP_App.h include/InsDbg.h
diff --git a/insDavi2.0/src/Protocol/Cdu_TCP.o b/insDavi2.0/src/Protocol/Cdu_TCP.o
deleted file mode 100644
index 46a8f8c..0000000
Binary files a/insDavi2.0/src/Protocol/Cdu_TCP.o and /dev/null differ
diff --git a/insDavi2.0/src/Protocol/MainBoard_IIC.d b/insDavi2.0/src/Protocol/MainBoard_IIC.d
deleted file mode 100644
index f093813..0000000
--- a/insDavi2.0/src/Protocol/MainBoard_IIC.d
+++ /dev/null
@@ -1,49 +0,0 @@
-src/Protocol/MainBoard_IIC.o: src/Protocol/MainBoard_IIC.c \
- include/Protocol/MainBoard_IIC.h include/InsCfg.h include/BaseTypes.h \
- include/Protocol/MainBoard_IIC_Sys.h \
- include/Protocol/MainBoard_IIC_App.h include/Protocol/Cdu_TCP_App.h \
- include/Protocol/Cdu_TCP.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/socket.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/features.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/cdefs.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/wordsize.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/gnu/stubs.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/uio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/types.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/types.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/typesizes.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/time.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stddef.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/endian.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/endian.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/byteswap.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/select.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/select.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sigset.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/time.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/sysmacros.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/pthreadtypes.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/uio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/socket.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sockaddr.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm/socket.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm/sockios.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/arpa/inet.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/netinet/in.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stdint.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/stdint.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/wchar.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/in.h \
- include/InsDbg.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/stdio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/libio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/_G_config.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/wchar.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stdarg.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/stdio_lim.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sys_errlist.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/stdio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/stdlib.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/waitflags.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/waitstatus.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/alloca.h
diff --git a/insDavi2.0/src/Protocol/MainBoard_IIC.o b/insDavi2.0/src/Protocol/MainBoard_IIC.o
deleted file mode 100644
index 4b1aa5b..0000000
Binary files a/insDavi2.0/src/Protocol/MainBoard_IIC.o and /dev/null differ
diff --git a/insDavi2.0/src/lib/InsFont.d b/insDavi2.0/src/lib/InsFont.d
deleted file mode 100644
index 0104615..0000000
--- a/insDavi2.0/src/lib/InsFont.d
+++ /dev/null
@@ -1,59 +0,0 @@
-src/lib/InsFont.o: src/lib/InsFont.c include/InsCfg.h \
- include/lib/InsFont.h include/BaseTypes.h \
- /home/lst/workspace/rootfs//usr/include/ft2build.h \
- /home/lst/workspace/rootfs//usr/include/freetype2/freetype/config/ftheader.h \
- /home/lst/workspace/rootfs//usr/include/freetype2/freetype/freetype.h \
- /home/lst/workspace/rootfs//usr/include/freetype2/freetype/config/ftconfig.h \
- /home/lst/workspace/rootfs//usr/include/freetype2/freetype/config/ftoption.h \
- /home/lst/workspace/rootfs//usr/include/freetype2/freetype/config/ftstdlib.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stddef.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include-fixed/limits.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include-fixed/syslimits.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/limits.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/features.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/cdefs.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/wordsize.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/gnu/stubs.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/posix1_lim.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/local_lim.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/linux/limits.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/posix2_lim.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/string.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/xlocale.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/string.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/string2.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/stdlib.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/stdio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/types.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/typesizes.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/libio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/_G_config.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/wchar.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stdarg.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/stdio_lim.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sys_errlist.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/stdio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/waitflags.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/waitstatus.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/endian.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/endian.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/byteswap.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/types.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/time.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/select.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/select.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sigset.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/time.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/sysmacros.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/pthreadtypes.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/alloca.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/setjmp.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/setjmp.h \
- /home/lst/workspace/rootfs//usr/include/freetype2/freetype/fterrors.h \
- /home/lst/workspace/rootfs//usr/include/freetype2/freetype/ftmoderr.h \
- /home/lst/workspace/rootfs//usr/include/freetype2/freetype/fterrdef.h \
- /home/lst/workspace/rootfs//usr/include/freetype2/freetype/fttypes.h \
- /home/lst/workspace/rootfs//usr/include/freetype2/freetype/ftsystem.h \
- /home/lst/workspace/rootfs//usr/include/freetype2/freetype/ftimage.h \
- /home/lst/workspace/rootfs//usr/include/freetype2/freetype/ftglyph.h \
- include/InsDbg.h
diff --git a/insDavi2.0/src/lib/InsFont.o b/insDavi2.0/src/lib/InsFont.o
deleted file mode 100644
index 63f88fa..0000000
Binary files a/insDavi2.0/src/lib/InsFont.o and /dev/null differ
diff --git a/insDavi2.0/src/lib/InsGL.c b/insDavi2.0/src/lib/InsGL.c
deleted file mode 100644
index 41d69eb..0000000
--- a/insDavi2.0/src/lib/InsGL.c
+++ /dev/null
@@ -1,527 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <InsCfg.h>
-#include <lib/InsGL.h>
-
-#define DBG_LEVEL DBG_INFO
-#define DBG_TAG "LibGL"
-#include <InsDbg.h>
-
-#ifdef COMPILE_IN_WINDOWS
-
-#include <windows.h>
-#define GLEW_STATIC
-#include <GL/glew.h>
-
-static HDC mHDc;
-static HGLRC mHGlrc;
-
-#else
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <assert.h>
-#include <EGL/egl.h>
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
-
-#define MXCFB_SET_GBL_ALPHA _IOW('F', 0x21, struct mxcfb_gbl_alpha)
-#define MXCFB_SET_CLR_KEY _IOW('F', 0x22, struct mxcfb_color_key)
-
-struct mxcfb_gbl_alpha {
-        int enable;
-        int alpha;
-};
-
-struct mxcfb_color_key {
-        int enable;
-        unsigned int color_key;
-};
-
-//static const EGLint egl_config_attribs[] =
-//{
-//    EGL_RED_SIZE,     8,
-//    EGL_GREEN_SIZE,   8,
-//    EGL_BLUE_SIZE,    8,
-//    EGL_ALPHA_SIZE,   EGL_DONT_CARE,
-//    EGL_DEPTH_SIZE,   16,
-//    EGL_SAMPLES,      0,
-//    EGL_SAMPLE_BUFFERS,   0,
-//    EGL_STENCIL_SIZE, 3,
-//    EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
-//    EGL_NONE,
-//};
-
-static const EGLint egl_config_attribs[] =
-{
-    EGL_RED_SIZE,     8,
-    EGL_GREEN_SIZE,   8,
-    EGL_BLUE_SIZE,    8,
-    EGL_ALPHA_SIZE,   0,
-    EGL_DEPTH_SIZE,   16,
-    EGL_SAMPLES,      0,
-    EGL_SAMPLE_BUFFERS,   0,
-    EGL_STENCIL_SIZE, 0,
-    EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
-    EGL_NONE,
-};
-
-//static const EGLint egl_config_attribs[] =
-//{
-//    EGL_RED_SIZE,     8,
-//    EGL_GREEN_SIZE,   8,
-//    EGL_BLUE_SIZE,    8,
-//    EGL_ALPHA_SIZE,   0,
-//    EGL_DEPTH_SIZE,   16,
-//    EGL_SAMPLES,      1,
-//    EGL_SAMPLE_BUFFERS,   4,
-//    EGL_STENCIL_SIZE, 0,
-//    EGL_NONE,
-//};
-
-//static const EGLint egl_config_attribs[] =
-//{
-//    EGL_RED_SIZE,     8,
-//    EGL_GREEN_SIZE,   8,
-//    EGL_BLUE_SIZE,    8,
-//    EGL_ALPHA_SIZE,   0,
-//    EGL_DEPTH_SIZE,   16,
-//    EGL_SAMPLES,      1,
-//    EGL_SAMPLE_BUFFERS,   4,
-//    EGL_STENCIL_SIZE, 0,
-//    EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
-//    EGL_NONE,
-//};
-
-static EGLDisplay	egldisplay;
-static EGLSurface	eglsurface;
-static EGLContext	eglcontext;
-static Bool egl_init_flg = INS_FALSE;
-
-#ifndef COMPILE_IN_WINDOWS
-static EGLDisplay	egldisplay_fb1;
-static EGLSurface	eglsurface_fb1;
-static EGLContext	eglcontext_fb1;
-static Bool egl_init_flg_fb1 = INS_FALSE;
-#endif // COMPILE_IN_WINDOWS
-
-#endif // COMPILE_IN_WINDOWS
-
-#ifdef COMPILE_IN_WINDOWS
-Bool InitGL()
-{
-    PIXELFORMATDESCRIPTOR pfd;
-
-    int iFormat;
-    GLenum glewInitFlg;
-
-    /* get the device context (DC) */
-    mHDc = GetDC(InsRenderHwnd);
-
-    /* set the pixel format for the DC */
-    ZeroMemory(&pfd, sizeof(pfd));
-
-    pfd.nSize = sizeof(pfd);
-    pfd.nVersion = 1;
-    pfd.dwFlags = PFD_DRAW_TO_WINDOW |  /// 支持在窗口中绘图
-                  PFD_SUPPORT_OPENGL |  /// 支持 OpenGL
-                  PFD_DOUBLEBUFFER;     /// 双缓存模式
-    pfd.iPixelType = PFD_TYPE_RGBA;     /// RGBA 颜色模式
-    pfd.cColorBits = 24;                /// 24 位颜色深度
-    pfd.cDepthBits = 16;                /// 16 位深度缓存
-    pfd.iLayerType = PFD_MAIN_PLANE;    /// 主层
-
-    iFormat = ChoosePixelFormat(mHDc, &pfd);
-
-    SetPixelFormat(mHDc, iFormat, &pfd);
-
-    /* create and enable the render context (RC) */
-    mHGlrc = wglCreateContext(mHDc);
-
-    wglMakeCurrent(mHDc, mHGlrc);
-
-    glewInitFlg = glewInit();
-    if(glewInitFlg != GLEW_OK)
-    {
-        const GLubyte *errinfo;
-        errinfo = glewGetErrorString(glewInitFlg);
-        DBG_Log(DBG_ERROR, "GLEW init error:\n%s\n", errinfo);
-    }
-    return INS_TRUE;
-}
-#else
-
-Bool InitGL(Int32 x, Int32 y, Int32 w, Int32 h, Int32 *rtw, Int32 *rth)
-{
-    #define MAX_CFG_NUM 100
-	EGLint numconfigs;
-	EGLConfig			 eglconfig[MAX_CFG_NUM];
-	EGLNativeWindowType  eglNativeWindow;
-	EGLNativeDisplayType eglNativeDisplayType;
-
-#if 1
-	UInt08 fb;
-
-	struct mxcfb_color_key key;
-	struct mxcfb_gbl_alpha gbl_alpha;
-
-	fb = open("/dev/fb0", O_RDWR, 0);
-	if(fb < 0)
-    {
-        printf("open /dev/fb0 fail.\n");
-    }
-
-	key.enable = 1;
-	key.color_key = 0x0;//0xff000000;
-	if(ioctl(fb, MXCFB_SET_CLR_KEY, &key) < 0)
-    {
-        printf("MXCFB_SET_CLR_KEY fail.\n");
-    }
-
-	gbl_alpha.enable = 1;
-	gbl_alpha.alpha = 0xff;
-	if(ioctl(fb, MXCFB_SET_GBL_ALPHA, &gbl_alpha) < 0)
-    {
-        printf("MXCFB_SET_GBL_ALPHA fail.\n");
-    }
-
-	close(fb);
-#endif
-
-	eglNativeDisplayType = fbGetDisplayByIndex(0);
-	egldisplay = eglGetDisplay(eglNativeDisplayType);
-
-	EGLint major, minor;
-	if(eglInitialize(egldisplay, &major, &minor) == EGL_TRUE)
-    {
-        DBG_Log(DBG_INFO, "EGL initialize success, version %d.%d\n", major, minor);
-    }
-    else if(eglGetError() == EGL_BAD_DISPLAY)
-    {
-        DBG_Log(DBG_ERROR, "EGL initialize failure, [EGL_BAD_DISPLAY]\n");
-    }
-    else if(eglGetError() == EGL_NOT_INITIALIZED)
-    {
-        DBG_Log(DBG_ERROR, "EGL initialize failure, [EGL_NOT_INITIALIZED]\n");
-    }
-    else
-    {
-        DBG_Log(DBG_ERROR, "EGL initialize failure, [unknown error]\n");
-    }
-    //assert(eglGetError() == EGL_SUCCESS);
-	///启用OpenGL ES Api
-	eglBindAPI(EGL_OPENGL_ES_API);
-
-//	EGLConfig cfgs[100];
-	EGLint i, value;
-//	EGLint num = 0;
-//	eglGetConfigs(egldisplay, cfgs, 100, &num);
-//	printf("List:\n");
-//	for(i = 0; i < num; i++)
-//    {
-//        printf("CFG[%3d]: ", i);
-//        eglGetConfigAttrib(egldisplay, cfgs[i], EGL_RED_SIZE, &value);
-//        printf("EGL_RED_SIZE[%2d] ", value);
-//        eglGetConfigAttrib(egldisplay, cfgs[i], EGL_GREEN_SIZE, &value);
-//        printf("EGL_GREEN_SIZE[%2d] ", value);
-//        eglGetConfigAttrib(egldisplay, cfgs[i], EGL_BLUE_SIZE, &value);
-//        printf("EGL_BLUE_SIZE[%2d] ", value);
-//        eglGetConfigAttrib(egldisplay, cfgs[i], EGL_ALPHA_SIZE, &value);
-//        printf("EGL_ALPHA_SIZE[%2d] ", value);
-//        eglGetConfigAttrib(egldisplay, cfgs[i], EGL_BUFFER_SIZE, &value);
-//        printf("EGL_BUFFER_SIZE[%2d] ", value);
-//        eglGetConfigAttrib(egldisplay, cfgs[i], EGL_DEPTH_SIZE, &value);
-//        printf("EGL_DEPTH_SIZE[%2d] ", value);
-//        eglGetConfigAttrib(egldisplay, cfgs[i], EGL_SAMPLE_BUFFERS, &value);
-//        printf("EGL_SAMPLE_BUFFERS[%2d] ", value);
-//        eglGetConfigAttrib(egldisplay, cfgs[i], EGL_SAMPLES, &value);
-//        printf("EGL_SAMPLES[%2d] ", value);
-//        eglGetConfigAttrib(egldisplay, cfgs[i], EGL_STENCIL_SIZE, &value);
-//        printf("EGL_STENCIL_SIZE[%2d] ", value);
-//        eglGetConfigAttrib(egldisplay, cfgs[i], EGL_SURFACE_TYPE, &value);
-//        printf("EGL_SURFACE_TYPE[%2d] ", value);
-//        printf("\n");
-//    }
-
-	eglChooseConfig(egldisplay, egl_config_attribs, eglconfig, MAX_CFG_NUM, &numconfigs);
-	printf("Configurations:[%d]\n", numconfigs);
-	for(i = 0; i < numconfigs; i++)
-    {
-        printf("CFG[%3d]: ", i);
-        eglGetConfigAttrib(egldisplay, eglconfig[i], EGL_RED_SIZE, &value);
-        printf("EGL_RED_SIZE[%2d] ", value);
-        eglGetConfigAttrib(egldisplay, eglconfig[i], EGL_GREEN_SIZE, &value);
-        printf("EGL_GREEN_SIZE[%2d] ", value);
-        eglGetConfigAttrib(egldisplay, eglconfig[i], EGL_BLUE_SIZE, &value);
-        printf("EGL_BLUE_SIZE[%2d] ", value);
-        eglGetConfigAttrib(egldisplay, eglconfig[i], EGL_ALPHA_SIZE, &value);
-        printf("EGL_ALPHA_SIZE[%2d] ", value);
-        eglGetConfigAttrib(egldisplay, eglconfig[i], EGL_BUFFER_SIZE, &value);
-        printf("EGL_BUFFER_SIZE[%2d] ", value);
-        eglGetConfigAttrib(egldisplay, eglconfig[i], EGL_DEPTH_SIZE, &value);
-        printf("EGL_DEPTH_SIZE[%2d] ", value);
-        eglGetConfigAttrib(egldisplay, eglconfig[i], EGL_SAMPLE_BUFFERS, &value);
-        printf("EGL_SAMPLE_BUFFERS[%2d] ", value);
-        eglGetConfigAttrib(egldisplay, eglconfig[i], EGL_SAMPLES, &value);
-        printf("EGL_SAMPLES[%2d] ", value);
-        eglGetConfigAttrib(egldisplay, eglconfig[i], EGL_STENCIL_SIZE, &value);
-        printf("EGL_STENCIL_SIZE[%2d] ", value);
-        eglGetConfigAttrib(egldisplay, eglconfig[i], EGL_SURFACE_TYPE, &value);
-        printf("EGL_SURFACE_TYPE[%2d] ", value);
-        printf("\n");
-    }
-	assert(eglGetError() == EGL_SUCCESS);
-	assert(numconfigs != 0);
-	for(i = 0; i < numconfigs; i++)
-    {
-//        eglGetConfigAttrib(egldisplay, eglconfig[i], EGL_ALPHA_SIZE, &value);
-//        if(value != 0)continue;
-//        eglGetConfigAttrib(egldisplay, eglconfig[i], EGL_BUFFER_SIZE, &value);
-//        if(value != 24)continue;
-        eglGetConfigAttrib(egldisplay, eglconfig[i], EGL_STENCIL_SIZE, &value);
-        if(value != 0)continue;
-        eglGetConfigAttrib(egldisplay, eglconfig[i], EGL_SAMPLE_BUFFERS, &value);
-        if(value != 1)continue;
-        eglGetConfigAttrib(egldisplay, eglconfig[i], EGL_SAMPLES, &value);
-        if(value != 4)continue;
-        eglGetConfigAttrib(egldisplay, eglconfig[i], EGL_DEPTH_SIZE, &value);
-        if(value != 16)continue;
-
-        i++;
-        break;
-    }
-	assert(i != 0);
-	i--;
-	printf("Use Configuration:[%d]\n", i);
-    eglGetConfigAttrib(egldisplay, eglconfig[i], EGL_RED_SIZE, &value);
-    printf("EGL_RED_SIZE[%2d] ", value);
-    eglGetConfigAttrib(egldisplay, eglconfig[i], EGL_GREEN_SIZE, &value);
-    printf("EGL_GREEN_SIZE[%2d] ", value);
-    eglGetConfigAttrib(egldisplay, eglconfig[i], EGL_BLUE_SIZE, &value);
-    printf("EGL_BLUE_SIZE[%2d] ", value);
-    eglGetConfigAttrib(egldisplay, eglconfig[i], EGL_ALPHA_SIZE, &value);
-    printf("EGL_ALPHA_SIZE[%2d] ", value);
-    eglGetConfigAttrib(egldisplay, eglconfig[i], EGL_BUFFER_SIZE, &value);
-    printf("EGL_BUFFER_SIZE[%2d] ", value);
-    eglGetConfigAttrib(egldisplay, eglconfig[i], EGL_DEPTH_SIZE, &value);
-    printf("EGL_DEPTH_SIZE[%2d] ", value);
-    eglGetConfigAttrib(egldisplay, eglconfig[i], EGL_SAMPLE_BUFFERS, &value);
-    printf("EGL_SAMPLE_BUFFERS[%2d] ", value);
-    eglGetConfigAttrib(egldisplay, eglconfig[i], EGL_SAMPLES, &value);
-    printf("EGL_SAMPLES[%2d] ", value);
-    eglGetConfigAttrib(egldisplay, eglconfig[i], EGL_STENCIL_SIZE, &value);
-    printf("EGL_STENCIL_SIZE[%2d] ", value);
-    eglGetConfigAttrib(egldisplay, eglconfig[i], EGL_SURFACE_TYPE, &value);
-    printf("EGL_SURFACE_TYPE[%2d] ", value);
-    printf("\n");
-
-	eglNativeWindow = fbCreateWindow(eglNativeDisplayType, x, y, w, h);
-	assert(eglNativeWindow);
-
-	eglsurface = eglCreateWindowSurface(egldisplay, eglconfig[i], eglNativeWindow, NULL);
-    assert(eglGetError() == EGL_SUCCESS);
-	///指定使用OpenGL ES的版本
-	EGLint ContextAttribList[] = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE };
-
-	eglcontext = eglCreateContext(egldisplay, eglconfig[i], EGL_NO_CONTEXT, ContextAttribList);
-	assert(eglGetError() == EGL_SUCCESS);
-
-	eglMakeCurrent(egldisplay, eglsurface, eglsurface, eglcontext);
-	assert(eglGetError() == EGL_SUCCESS);
-
-	///fb区域大小，在EGL初始化中query获取
-	if(rtw != NULL)
-	{
-	    eglQuerySurface(egldisplay, eglsurface, EGL_WIDTH, rtw);
-	    DBG_Log(DBG_INFO, "EGL_WIDTH:%d, width:%d\n", EGL_WIDTH, *rtw);
-	}
-	if(rth != NULL)
-    {
-        eglQuerySurface(egldisplay, eglsurface, EGL_HEIGHT, rth);
-	    DBG_Log(DBG_INFO, "EGL_HEIGHT:%d, width:%d\n", EGL_HEIGHT, *rth);
-    }
-
-    printf("InitGL end\n");
-	egl_init_flg = INS_TRUE;
-
-    return INS_TRUE;
-}
-
-Bool InitGL_FB1(Int32 x, Int32 y, Int32 w, Int32 h, Int32 *rtw, Int32 *rth)
-{
-    #define MAX_CFG_NUM 100
-	EGLint numconfigs;
-	EGLConfig			 eglconfig[MAX_CFG_NUM];
-	EGLNativeWindowType  eglNativeWindow;
-	EGLNativeDisplayType eglNativeDisplayType;
-	EGLint i, value;
-
-	eglNativeDisplayType = fbGetDisplayByIndex(1);
-	egldisplay_fb1 = eglGetDisplay(eglNativeDisplayType);
-
-	EGLint major, minor;
-	if(eglInitialize(egldisplay_fb1, &major, &minor) == EGL_TRUE)
-    {
-        DBG_Log(DBG_INFO, "EGL initialize success, version %d.%d\n", major, minor);
-    }
-    else if(eglGetError() == EGL_BAD_DISPLAY)
-    {
-        DBG_Log(DBG_ERROR, "EGL initialize failure, [EGL_BAD_DISPLAY]\n");
-    }
-    else if(eglGetError() == EGL_NOT_INITIALIZED)
-    {
-        DBG_Log(DBG_ERROR, "EGL initialize failure, [EGL_NOT_INITIALIZED]\n");
-    }
-    else
-    {
-        DBG_Log(DBG_ERROR, "EGL initialize failure, [unknown error]\n");
-    }
-    //assert(eglGetError() == EGL_SUCCESS);
-	///启用OpenGL ES Api
-	eglBindAPI(EGL_OPENGL_ES_API);
-
-	eglChooseConfig(egldisplay_fb1, egl_config_attribs, eglconfig, MAX_CFG_NUM, &numconfigs);
-	assert(eglGetError() == EGL_SUCCESS);
-	assert(numconfigs != 0);
-
-	for(i = 0; i < numconfigs; i++)
-    {
-        eglGetConfigAttrib(egldisplay_fb1, eglconfig[i], EGL_ALPHA_SIZE, &value);
-        if(value != 0)continue;
-        eglGetConfigAttrib(egldisplay_fb1, eglconfig[i], EGL_BUFFER_SIZE, &value);
-        if(value != 24)continue;
-        eglGetConfigAttrib(egldisplay_fb1, eglconfig[i], EGL_STENCIL_SIZE, &value);
-        if(value != 0)continue;
-        eglGetConfigAttrib(egldisplay_fb1, eglconfig[i], EGL_SAMPLE_BUFFERS, &value);
-        if(value != 1)continue;
-        eglGetConfigAttrib(egldisplay_fb1, eglconfig[i], EGL_SAMPLES, &value);
-        if(value != 4)continue;
-        eglGetConfigAttrib(egldisplay_fb1, eglconfig[i], EGL_DEPTH_SIZE, &value);
-        if(value != 16)continue;
-
-        i++;
-        break;
-    }
-	assert(i != 0);
-	i = i-1;
-	printf("Use Configuration:[%d]\n", i);
-    eglGetConfigAttrib(egldisplay_fb1, eglconfig[i], EGL_RED_SIZE, &value);
-    printf("EGL_RED_SIZE[%2d] ", value);
-    eglGetConfigAttrib(egldisplay_fb1, eglconfig[i], EGL_GREEN_SIZE, &value);
-    printf("EGL_GREEN_SIZE[%2d] ", value);
-    eglGetConfigAttrib(egldisplay_fb1, eglconfig[i], EGL_BLUE_SIZE, &value);
-    printf("EGL_BLUE_SIZE[%2d] ", value);
-    eglGetConfigAttrib(egldisplay_fb1, eglconfig[i], EGL_ALPHA_SIZE, &value);
-    printf("EGL_ALPHA_SIZE[%2d] ", value);
-    eglGetConfigAttrib(egldisplay_fb1, eglconfig[i], EGL_BUFFER_SIZE, &value);
-    printf("EGL_BUFFER_SIZE[%2d] ", value);
-    eglGetConfigAttrib(egldisplay_fb1, eglconfig[i], EGL_DEPTH_SIZE, &value);
-    printf("EGL_DEPTH_SIZE[%2d] ", value);
-    eglGetConfigAttrib(egldisplay_fb1, eglconfig[i], EGL_SAMPLE_BUFFERS, &value);
-    printf("EGL_SAMPLE_BUFFERS[%2d] ", value);
-    eglGetConfigAttrib(egldisplay_fb1, eglconfig[i], EGL_SAMPLES, &value);
-    printf("EGL_SAMPLES[%2d] ", value);
-    eglGetConfigAttrib(egldisplay_fb1, eglconfig[i], EGL_STENCIL_SIZE, &value);
-    printf("EGL_STENCIL_SIZE[%2d] ", value);
-    eglGetConfigAttrib(egldisplay_fb1, eglconfig[i], EGL_SURFACE_TYPE, &value);
-    printf("EGL_SURFACE_TYPE[%2d] ", value);
-    printf("\n");
-
-	eglNativeWindow = fbCreateWindow(eglNativeDisplayType, x, y, w, h);
-	assert(eglNativeWindow);
-
-	eglsurface_fb1 = eglCreateWindowSurface(egldisplay_fb1, eglconfig[i], eglNativeWindow, NULL);
-    assert(eglGetError() == EGL_SUCCESS);
-	///指定使用OpenGL ES的版本
-	EGLint ContextAttribList[] = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE };
-
-	eglcontext_fb1 = eglCreateContext(egldisplay_fb1, eglconfig[i], EGL_NO_CONTEXT, ContextAttribList);
-	assert(eglGetError() == EGL_SUCCESS);
-
-	eglMakeCurrent(egldisplay_fb1, eglsurface_fb1, eglsurface_fb1, eglcontext_fb1);
-	assert(eglGetError() == EGL_SUCCESS);
-
-	///fb区域大小，在EGL初始化中query获取
-	if(rtw != NULL)
-	{
-	    eglQuerySurface(egldisplay_fb1, eglsurface_fb1, EGL_WIDTH, rtw);
-	    DBG_Log(DBG_INFO, "EGL_WIDTH:%d, width:%d\n", EGL_WIDTH, *rtw);
-	}
-	if(rth != NULL)
-    {
-        eglQuerySurface(egldisplay_fb1, eglsurface_fb1, EGL_HEIGHT, rth);
-	    DBG_Log(DBG_INFO, "EGL_HEIGHT:%d, width:%d\n", EGL_HEIGHT, *rth);
-    }
-
-	egl_init_flg_fb1 = INS_TRUE;
-    printf("InitGL_FB1 end\n");
-
-    return INS_TRUE;
-}
-
-Bool SwapGLBuffer_FB1()
-{
-    glFinish();
-    eglSwapBuffers(egldisplay_fb1, eglsurface_fb1);
-    return INS_TRUE;
-}
-
-void DeInitGL_FB1()
-{
-	if(egl_init_flg_fb1 == INS_FALSE)
-	{
-        glClearColor(0.0, 0.0, 0.0, 0.0);
-    	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
-        eglSwapBuffers(egldisplay_fb1, eglsurface_fb1);
-		eglMakeCurrent(egldisplay_fb1, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-		//assert(eglGetError() == EGL_SUCCESS);
-		eglDestroyContext(egldisplay_fb1, eglcontext_fb1);
-		eglDestroySurface(egldisplay_fb1, eglsurface_fb1);
-		eglTerminate(egldisplay_fb1);
-		//assert(eglGetError() == EGL_SUCCESS);
-		eglReleaseThread();
-		egl_init_flg_fb1 = INS_TRUE;
-	}
-}
-
-#endif // COMPILE_IN_WINDOWS
-
-Bool SwapGLBuffer()
-{
-    glFinish();
-#ifdef COMPILE_IN_WINDOWS
-    SwapBuffers(mHDc);
-#else
-    eglSwapBuffers(egldisplay, eglsurface);
-#endif // COMPILE_IN_WINDOWS
-    return INS_TRUE;
-}
-
-void DeInitGL()
-{
-#ifdef COMPILE_IN_WINDOWS
-    /* get the device context (DC) */
-    wglMakeCurrent(NULL, NULL);
-    wglDeleteContext(mHGlrc);
-    ReleaseDC(InsRenderHwnd, mHDc);
-#else
-	if(egl_init_flg == INS_FALSE)
-	{
-        glClearColor(0.0, 0.0, 0.0, 0.0);
-    	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
-        eglSwapBuffers(egldisplay, eglsurface);
-		eglMakeCurrent(egldisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-		//assert(eglGetError() == EGL_SUCCESS);
-		eglDestroyContext(egldisplay, eglcontext);
-		eglDestroySurface(egldisplay, eglsurface);
-		eglTerminate(egldisplay);
-		//assert(eglGetError() == EGL_SUCCESS);
-		eglReleaseThread();
-		egl_init_flg = INS_TRUE;
-	}
-#endif // COMPILE_IN_WINDOWS
-}
diff --git a/insDavi2.0/src/lib/InsGL.d b/insDavi2.0/src/lib/InsGL.d
deleted file mode 100644
index 2fe2a1a..0000000
--- a/insDavi2.0/src/lib/InsGL.d
+++ /dev/null
@@ -1,65 +0,0 @@
-src/lib/InsGL.o: src/lib/InsGL.c \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/stdio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/features.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/cdefs.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/wordsize.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/gnu/stubs.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stddef.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/types.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/typesizes.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/libio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/_G_config.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/wchar.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stdarg.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/stdio_lim.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sys_errlist.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/stdio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/stdlib.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/waitflags.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/waitstatus.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/endian.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/endian.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/byteswap.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/types.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/time.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/select.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/select.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sigset.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/time.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/sysmacros.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/pthreadtypes.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/alloca.h \
- include/InsCfg.h include/lib/InsGL.h include/BaseTypes.h \
- include/InsDbg.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/stat.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/stat.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/ioctl.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/ioctls.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm/ioctls.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm-generic/ioctls.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/linux/ioctl.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm/ioctl.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/asm-generic/ioctl.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/ioctl-types.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/ttydefaults.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/fcntl.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/fcntl.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/unistd.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/posix_opt.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/environments.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/confname.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/getopt.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/assert.h \
- /home/lst/workspace/rootfs//usr/include/EGL/egl.h \
- /home/lst/workspace/rootfs//usr/include/EGL/eglplatform.h \
- /home/lst/workspace/rootfs//usr/include/KHR/khrplatform.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stdint.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/stdint.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/wchar.h \
- /home/lst/workspace/rootfs//usr/include/EGL/eglvivante.h \
- /home/lst/workspace/rootfs//usr/include/EGL/eglrename.h \
- /home/lst/workspace/rootfs//usr/include/EGL/eglext.h \
- /home/lst/workspace/rootfs//usr/include/GLES2/gl2.h \
- /home/lst/workspace/rootfs//usr/include/GLES2/gl2platform.h \
- /home/lst/workspace/rootfs//usr/include/GLES2/gl2rename.h \
- /home/lst/workspace/rootfs//usr/include/GLES2/gl2ext.h
diff --git a/insDavi2.0/src/lib/InsGL.o b/insDavi2.0/src/lib/InsGL.o
deleted file mode 100644
index 3d9a300..0000000
Binary files a/insDavi2.0/src/lib/InsGL.o and /dev/null differ
diff --git a/insDavi2.0/src/lib/InsJpeg.d b/insDavi2.0/src/lib/InsJpeg.d
deleted file mode 100644
index 11fc3d4..0000000
--- a/insDavi2.0/src/lib/InsJpeg.d
+++ /dev/null
@@ -1,41 +0,0 @@
-src/lib/InsJpeg.o: src/lib/InsJpeg.c include/lib/InsJpeg.h \
- include/BaseTypes.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/stdio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/features.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/cdefs.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/wordsize.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/gnu/stubs.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stddef.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/types.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/typesizes.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/libio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/_G_config.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/wchar.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stdarg.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/stdio_lim.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sys_errlist.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/stdio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/stdlib.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/waitflags.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/waitstatus.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/endian.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/endian.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/byteswap.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/types.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/time.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/select.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/select.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sigset.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/time.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/sysmacros.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/pthreadtypes.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/alloca.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/setjmp.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/setjmp.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/string.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/xlocale.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/string.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/string2.h \
- /home/lst/workspace/jpeg/jpeg-9c/install/include/jpeglib.h \
- /home/lst/workspace/jpeg/jpeg-9c/install/include/jconfig.h \
- /home/lst/workspace/jpeg/jpeg-9c/install/include/jmorecfg.h
diff --git a/insDavi2.0/src/lib/InsJpeg.o b/insDavi2.0/src/lib/InsJpeg.o
deleted file mode 100644
index 40ffd30..0000000
Binary files a/insDavi2.0/src/lib/InsJpeg.o and /dev/null differ
diff --git a/insDavi2.0/src/lib/InsMatrix.d b/insDavi2.0/src/lib/InsMatrix.d
deleted file mode 100644
index 1d3a6b8..0000000
--- a/insDavi2.0/src/lib/InsMatrix.d
+++ /dev/null
@@ -1,23 +0,0 @@
-src/lib/InsMatrix.o: src/lib/InsMatrix.c include/lib/InsMatrix.h \
- include/InsCfg.h include/BaseTypes.h \
- /home/lst/workspace/rootfs//usr/include/GLES2/gl2.h \
- /home/lst/workspace/rootfs//usr/include/GLES2/gl2platform.h \
- /home/lst/workspace/rootfs//usr/include/KHR/khrplatform.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stdint.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/stdint.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/features.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/cdefs.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/wordsize.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/gnu/stubs.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/wchar.h \
- /home/lst/workspace/rootfs//usr/include/GLES2/gl2rename.h \
- /home/lst/workspace/rootfs//usr/include/GLES2/gl2ext.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/math.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/huge_val.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/huge_valf.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/huge_vall.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/inf.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/nan.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/mathdef.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/mathcalls.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/mathinline.h
diff --git a/insDavi2.0/src/lib/InsMatrix.o b/insDavi2.0/src/lib/InsMatrix.o
deleted file mode 100644
index d5aa45a..0000000
Binary files a/insDavi2.0/src/lib/InsMatrix.o and /dev/null differ
diff --git a/insDavi2.0/src/lib/InsPng.d b/insDavi2.0/src/lib/InsPng.d
deleted file mode 100644
index 9fb454c..0000000
--- a/insDavi2.0/src/lib/InsPng.d
+++ /dev/null
@@ -1,57 +0,0 @@
-src/lib/InsPng.o: src/lib/InsPng.c include/lib/InsPng.h \
- include/BaseTypes.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/stdio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/features.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/cdefs.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/wordsize.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/gnu/stubs.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stddef.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/types.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/typesizes.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/libio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/_G_config.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/wchar.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stdarg.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/stdio_lim.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sys_errlist.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/stdio.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/stdlib.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/waitflags.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/waitstatus.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/endian.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/endian.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/byteswap.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/types.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/time.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/select.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/select.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sigset.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/time.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/sysmacros.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/pthreadtypes.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/alloca.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/setjmp.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/setjmp.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/string.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/xlocale.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/string.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/string2.h \
- /home/lst/workspace/zlib/zlib_build/zlib.h \
- /home/lst/workspace/zlib/zlib_build/zconf.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include-fixed/limits.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include-fixed/syslimits.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/limits.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/posix1_lim.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/local_lim.h \
- /home/lst/workspace/rootfs//usr/src/linux/include/linux/limits.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/posix2_lim.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/unistd.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/posix_opt.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/environments.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/confname.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/getopt.h \
- /home/lst/workspace/libpng/libpng_build/png.h \
- /home/lst/workspace/libpng/libpng_build/pnglibconf.h \
- /home/lst/workspace/libpng/libpng_build/pngconf.h \
- /home/lst/workspace/libpng/libpng_build/pngstruct.h \
- /home/lst/workspace/libpng/libpng_build/pnginfo.h
diff --git a/insDavi2.0/src/lib/InsPng.o b/insDavi2.0/src/lib/InsPng.o
deleted file mode 100644
index 3575f96..0000000
Binary files a/insDavi2.0/src/lib/InsPng.o and /dev/null differ
diff --git a/insDavi2.0/src/lib/InsQueue.d b/insDavi2.0/src/lib/InsQueue.d
deleted file mode 100644
index 6401906..0000000
--- a/insDavi2.0/src/lib/InsQueue.d
+++ /dev/null
@@ -1,24 +0,0 @@
-src/lib/InsQueue.o: src/lib/InsQueue.c \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/stdlib.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/features.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/cdefs.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/wordsize.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/gnu/stubs.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/include/stddef.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/waitflags.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/waitstatus.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/endian.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/endian.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/byteswap.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/types.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/types.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/typesizes.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/time.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/select.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/select.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/sigset.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/time.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/sys/sysmacros.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/bits/pthreadtypes.h \
- /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../arm-fsl-linux-gnueabi/multi-libs/usr/include/alloca.h \
- include/lib/InsQueue.h include/BaseTypes.h
diff --git a/insDavi2.0/src/lib/InsQueue.o b/insDavi2.0/src/lib/InsQueue.o
deleted file mode 100644
index 05aaa71..0000000
Binary files a/insDavi2.0/src/lib/InsQueue.o and /dev/null differ