Merge with pocoproject/develop

Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2024-12-15 03:21:09 +01:00 · 2016-03-08 12:36:00 +01:00 · 2016-03-08 12:36:00 +01:00 · be1a697791
commit be1a697791
parent 4441b38228
94 changed files with 0 additions and 0 deletions
--- a/PocoDoc/resources/js/iframeResizer.contentWindow.js
+++ b/PocoDoc/resources/js/iframeResizer.contentWindow.js
--- a/PocoDoc/resources/js/iframeResizer.contentWindow.min.js
+++ b/PocoDoc/resources/js/iframeResizer.contentWindow.min.js
--- a/PocoDoc/resources/js/iframeResizer.js
+++ b/PocoDoc/resources/js/iframeResizer.js
--- a/PocoDoc/resources/js/iframeResizer.min.js
+++ b/PocoDoc/resources/js/iframeResizer.min.js
--- a/SevenZip/src/7z.h
+++ b/SevenZip/src/7z.h
--- a/SevenZip/src/7zAlloc.c
+++ b/SevenZip/src/7zAlloc.c
--- a/SevenZip/src/7zAlloc.h
+++ b/SevenZip/src/7zAlloc.h
--- a/SevenZip/src/7zBuf.c
+++ b/SevenZip/src/7zBuf.c
--- a/SevenZip/src/7zBuf.h
+++ b/SevenZip/src/7zBuf.h
--- a/SevenZip/src/7zBuf2.c
+++ b/SevenZip/src/7zBuf2.c
--- a/SevenZip/src/7zCrc.c
+++ b/SevenZip/src/7zCrc.c
--- a/SevenZip/src/7zCrc.h
+++ b/SevenZip/src/7zCrc.h
--- a/SevenZip/src/7zCrcOpt.c
+++ b/SevenZip/src/7zCrcOpt.c
--- a/SevenZip/src/7zDec.c
+++ b/SevenZip/src/7zDec.c
--- a/SevenZip/src/7zFile.c
+++ b/SevenZip/src/7zFile.c
--- a/SevenZip/src/7zFile.h
+++ b/SevenZip/src/7zFile.h
--- a/SevenZip/src/7zIn.c
+++ b/SevenZip/src/7zIn.c
--- a/SevenZip/src/7zStream.c
+++ b/SevenZip/src/7zStream.c
--- a/SevenZip/src/7zVersion.h
+++ b/SevenZip/src/7zVersion.h
--- a/SevenZip/src/Alloc.c
+++ b/SevenZip/src/Alloc.c
--- a/SevenZip/src/Alloc.h
+++ b/SevenZip/src/Alloc.h
--- a/SevenZip/src/Bcj2.c
+++ b/SevenZip/src/Bcj2.c
--- a/SevenZip/src/Bcj2.h
+++ b/SevenZip/src/Bcj2.h
--- a/SevenZip/src/Bra.c
+++ b/SevenZip/src/Bra.c
--- a/SevenZip/src/Bra.h
+++ b/SevenZip/src/Bra.h
--- a/SevenZip/src/Bra86.c
+++ b/SevenZip/src/Bra86.c
--- a/SevenZip/src/BraIA64.c
+++ b/SevenZip/src/BraIA64.c
--- a/SevenZip/src/CpuArch.c
+++ b/SevenZip/src/CpuArch.c
--- a/SevenZip/src/CpuArch.h
+++ b/SevenZip/src/CpuArch.h
--- a/SevenZip/src/Delta.c
+++ b/SevenZip/src/Delta.c
--- a/SevenZip/src/Delta.h
+++ b/SevenZip/src/Delta.h
--- a/SevenZip/src/LzFind.c
+++ b/SevenZip/src/LzFind.c
--- a/SevenZip/src/LzFind.h
+++ b/SevenZip/src/LzFind.h
--- a/SevenZip/src/LzFindMt.c
+++ b/SevenZip/src/LzFindMt.c
--- a/SevenZip/src/LzFindMt.h
+++ b/SevenZip/src/LzFindMt.h
--- a/SevenZip/src/LzHash.h
+++ b/SevenZip/src/LzHash.h
--- a/SevenZip/src/Lzma2Dec.c
+++ b/SevenZip/src/Lzma2Dec.c
--- a/SevenZip/src/Lzma2Dec.h
+++ b/SevenZip/src/Lzma2Dec.h
--- a/SevenZip/src/Lzma2Enc.c
+++ b/SevenZip/src/Lzma2Enc.c
--- a/SevenZip/src/Lzma2Enc.h
+++ b/SevenZip/src/Lzma2Enc.h
--- a/SevenZip/src/Lzma86.h
+++ b/SevenZip/src/Lzma86.h
--- a/SevenZip/src/Lzma86Dec.c
+++ b/SevenZip/src/Lzma86Dec.c
--- a/SevenZip/src/Lzma86Enc.c
+++ b/SevenZip/src/Lzma86Enc.c
--- a/SevenZip/src/LzmaDec.c
+++ b/SevenZip/src/LzmaDec.c
--- a/SevenZip/src/LzmaDec.h
+++ b/SevenZip/src/LzmaDec.h
--- a/SevenZip/src/LzmaEnc.c
+++ b/SevenZip/src/LzmaEnc.c
--- a/SevenZip/src/LzmaEnc.h
+++ b/SevenZip/src/LzmaEnc.h
--- a/SevenZip/src/LzmaLib.c
+++ b/SevenZip/src/LzmaLib.c
--- a/SevenZip/src/LzmaLib.h
+++ b/SevenZip/src/LzmaLib.h
--- a/SevenZip/src/MtCoder.c
+++ b/SevenZip/src/MtCoder.c
--- a/SevenZip/src/MtCoder.h
+++ b/SevenZip/src/MtCoder.h
--- a/SevenZip/src/Ppmd.h
+++ b/SevenZip/src/Ppmd.h
--- a/SevenZip/src/Ppmd7.c
+++ b/SevenZip/src/Ppmd7.c
--- a/SevenZip/src/Ppmd7.h
+++ b/SevenZip/src/Ppmd7.h
--- a/SevenZip/src/Ppmd7Dec.c
+++ b/SevenZip/src/Ppmd7Dec.c
--- a/SevenZip/src/Ppmd7Enc.c
+++ b/SevenZip/src/Ppmd7Enc.c
--- a/SevenZip/src/RotateDefs.h
+++ b/SevenZip/src/RotateDefs.h
--- a/SevenZip/src/Sha256.c
+++ b/SevenZip/src/Sha256.c
--- a/SevenZip/src/Sha256.h
+++ b/SevenZip/src/Sha256.h
--- a/SevenZip/src/Threads.c
+++ b/SevenZip/src/Threads.c
--- a/SevenZip/src/Threads.h
+++ b/SevenZip/src/Threads.h
--- a/SevenZip/src/Types.h
+++ b/SevenZip/src/Types.h
--- a/SevenZip/src/Xz.c
+++ b/SevenZip/src/Xz.c
--- a/SevenZip/src/Xz.h
+++ b/SevenZip/src/Xz.h
--- a/SevenZip/src/XzCrc64.c
+++ b/SevenZip/src/XzCrc64.c
--- a/SevenZip/src/XzCrc64.h
+++ b/SevenZip/src/XzCrc64.h
--- a/SevenZip/src/XzDec.c
+++ b/SevenZip/src/XzDec.c
--- a/SevenZip/src/XzEnc.c
+++ b/SevenZip/src/XzEnc.c
--- a/SevenZip/src/XzEnc.h
+++ b/SevenZip/src/XzEnc.h
--- a/SevenZip/src/XzIn.c
+++ b/SevenZip/src/XzIn.c
--- a/build/script/makedepend.SunCC
+++ b/build/script/makedepend.SunCC
--- a/build/script/makedepend.aCC
+++ b/build/script/makedepend.aCC
--- a/build/script/makedepend.clang
+++ b/build/script/makedepend.clang
--- a/build/script/makedepend.cxx
+++ b/build/script/makedepend.cxx
--- a/build/script/makedepend.gcc
+++ b/build/script/makedepend.gcc
--- a/build/script/makedepend.qcc
+++ b/build/script/makedepend.qcc
--- a/build/script/makedepend.xlC
+++ b/build/script/makedepend.xlC
--- a/build/script/makeldpath
+++ b/build/script/makeldpath
--- a/build/script/projname
+++ b/build/script/projname
--- a/build/script/runtests.sh
+++ b/build/script/runtests.sh
--- a/build/script/shlibln
+++ b/build/script/shlibln
--- a/build/script/vxprogen
+++ b/build/script/vxprogen
--- a/build_cmake.sh
+++ b/build_cmake.sh
--- a/0
+++ b/0
--- a/release/script/cpproj
+++ b/release/script/cpproj
--- a/release/script/mkdoc
+++ b/release/script/mkdoc
--- a/release/script/mkdocumentation
+++ b/release/script/mkdocumentation
--- a/release/script/mkrel
+++ b/release/script/mkrel
--- a/release/script/mkrelease
+++ b/release/script/mkrelease
--- a/travis/Linux/excluded.sh
+++ b/travis/Linux/excluded.sh
--- a/travis/Linux/runtests.sh
+++ b/travis/Linux/runtests.sh
--- a/travis/OSX/excluded.sh
+++ b/travis/OSX/excluded.sh
--- a/travis/OSX/runtests.sh
+++ b/travis/OSX/runtests.sh
--- a/travis/ignored.sh
+++ b/travis/ignored.sh