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

# Conflicts:
#	DesktopEditor/fontengine/ApplicationFonts.cpp

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

..

agg-2.4

restore

2021-10-12 12:45:01 +03:00

AllFontsGen

Fix bugs with regenerate thumbnails

2021-09-07 16:31:55 +03:00

allthemesgen

Merge pull request #689 from ONLYOFFICE/release/v6.4.0

2021-08-16 09:37:27 +03:00

common

fix StringExt

2021-11-08 13:02:05 +03:00

cximage

Merge branch 'develop' into fix/drawing_file_client

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

doctrenderer

Merge branch 'develop' into fix/drawing_file_client

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

fontengine

Merge branch 'develop' into fix/drawing_file_client

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

freetype_names

restore

2021-10-12 12:45:01 +03:00

freetype-2.5.2/include

Merge remote-tracking branch 'origin/release/v6.1.0' into develop

2020-11-02 11:16:17 +03:00

freetype-2.10.4

Merge branch 'develop' into fix/drawing_file_client

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

graphics

Merge branch 'develop' into fix/drawing_file_client

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

ios_projects/libxml2/libxml2.xcodeproj

[ios] rmeove unsused project

2019-11-22 13:04:04 +03:00

mac_build

[ios][se] fixed build

2019-09-30 14:47:32 +03:00

Qt_build

OdfFormat - fix after testing

2020-08-26 14:32:51 +03:00

raster

restore

2021-10-12 12:45:01 +03:00

test

restore

2021-10-12 12:45:01 +03:00

Word_Api

Add missed define

2021-11-08 20:14:08 +03:00

xml

restore

2021-10-12 12:45:01 +03:00

xmlsec

Merge branch 'develop' into fix/drawing_file_client

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

correct.py

Refactoring

2020-11-17 20:48:57 +03:00