Kulikova Svetlana 607c9b57f7 Merge remote-tracking branch 'origin/release/v7.2.0' into feature/pdfwriter ...

# Conflicts:
#	Common/3dParty/html/css/src/CCompiledStyle.cpp
#	Common/3dParty/html/css/src/ConstValues.h
#	Common/3dParty/html/css/src/xhtml/CDocumentStyle.cpp
#	HtmlFile2/htmlfile2.cpp

2022-06-09 17:19:14 +03:00

..

formulasconvert

fix bug #54765

2022-03-29 14:42:53 +03:00

include

Merge branch 'release/v7.1.0' into fix/v7.1.0-fix-bugs

2022-02-10 17:54:17 +03:00

linux

fix bug #54187

2021-11-30 16:28:13 +03:00

mac/ASCOfficeOdfFile

[ios][x2t] boost.framework build and odf_file projects

2019-02-02 15:05:44 +03:00

OdfFileTest

fix

2022-02-04 08:51:32 +03:00

src

Merge remote-tracking branch 'origin/release/v7.2.0' into feature/pdfwriter

2022-06-09 17:19:14 +03:00

win32

.

2022-02-09 18:35:24 +03:00