Commit Graph

2 Commits

Author SHA1 Message Date
e0fd7ff1f0 Merge branch 'develop' into fix/drawing_file_client
# Conflicts:
#	PdfReader/PdfReader.h
#	PdfReader/Src/RendererOutputDev.cpp
#	PdfReader/old/Graphics.cpp
2021-10-04 15:37:09 +03:00
3fb32cc029 first commit 2021-06-15 10:21:19 +03:00