Kulikova Svetlana f172cc86b3 Merge branch 'develop' into fix/drawing_file_client ...

# Conflicts:
#	DesktopEditor/fontengine/ApplicationFonts.cpp

2021-11-25 10:47:56 +03:00

..

HtmlRendererTestMacOS

Merged revision(s) from AVS/Sources/TeamlabOffice/branches/TeamlabOffice_v3.5_CPP:

2016-05-21 00:45:20 +03:00

include

[copyright] For bug 39644

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

Mac

stable iOS converter

2017-01-13 12:15:39 +03:00

src

Merge branch 'develop' into fix/drawing_file_client

2021-11-25 10:47:56 +03:00

test

Developing not embedded fonts in viewer

2021-10-10 20:49:15 +03:00

htmlrenderer.pro

Add frameworks build support

2019-12-05 18:15:23 +03:00