Commit Graph

13 Commits

Author SHA1 Message Date
92e2385650 DjVu GString return 2021-12-20 20:48:44 +03:00
fc7751a4e3 fix 2021-12-14 10:06:33 +03:00
bdf1295693 Merge remote-tracking branch 'origin/develop' into fix/drawing_file_client 2021-12-10 17:49:02 +03:00
d612b64b4b Merge branch 'release/v7.0.0' into develop 2021-12-10 12:04:00 +03:00
7b49631c73 Merge remote-tracking branch 'origin/release/v7.0.0' into develop
# Conflicts:
#	PdfReader/old/XRef.cpp
2021-11-29 11:15:53 +03:00
f172cc86b3 Merge branch 'develop' into fix/drawing_file_client
# Conflicts:
#	DesktopEditor/fontengine/ApplicationFonts.cpp
2021-11-25 10:47:56 +03:00
fc91e7b9ce refactoring 2021-11-08 18:00:30 +03:00
f5332a8b59 Fix problem with writing streams to xml 2021-10-22 10:08:57 +03:00
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
bafa576191 Merge branch 'feature/NewParcerNamespaceTest' into develop 2021-09-27 10:47:13 +03:00
c9144ea4c6 Namechages + adaptor classes 2021-06-25 18:37:59 +03:00
2ea9e20bd4 Merge branch 'feature/grad' into feature/newParser 2021-06-15 13:03:47 +03:00
3fb32cc029 first commit 2021-06-15 10:21:19 +03:00