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

# Conflicts:
#	DesktopEditor/fontengine/ApplicationFonts.cpp

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

..

CxImage

Merge remote-tracking branch 'origin/release/v7.0.0' into develop

2021-11-09 12:29:37 +03:00

jasper

restore

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

jbig

restore

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

jpeg

restore

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

libpsd

restore

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

mng

restore

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

png

restore

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

raw

Merge branch 'develop' into fix/drawing_file_client

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

tiff

restore

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

zlib

restore

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

CxImageFull.sln

…