Kulikova Svetlana 54b3fc1866 Merge remote-tracking branch 'origin/hotfix/v7.1.1' into fix/hotfix-v7.1.1-conflicts ...

# Conflicts:
#	Common/3dParty/html/css/src/CCompiledStyle.cpp
#	Common/3dParty/html/css/src/CCssCalculator_Private.cpp
#	Common/3dParty/html/css/src/ConstValues.h
#	Common/3dParty/html/css/src/xhtml/CDocumentStyle.cpp
#	Common/3dParty/html/htmltoxhtml.h
#	Common/Network/FileTransporter/src/FileTransporter_win.cpp
#	HtmlFile2/htmlfile2.cpp
#	HtmlFile2/test/main.cpp
#	PdfWriter/PdfRenderer.cpp
#	PdfWriter/PdfRenderer.h

2022-07-18 17:41:10 +03:00

..

Common

fix bug #53908

2021-11-24 18:28:20 +03:00

DocDocxConverter

Merge remote-tracking branch 'origin/hotfix/v7.1.1' into fix/hotfix-v7.1.1-conflicts

2022-07-18 17:41:10 +03:00

DocFormatLib

fix bug #56071

2022-03-17 09:16:53 +03:00

DocFormatTest

Revert "girignore"

2022-02-01 18:37:15 +03:00

DocxDocConverter

[copyright] For bug 39644

2019-01-17 17:03:31 +03:00