Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/artifex-local/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	.gitmodules
#	thirdparty/curl
#	thirdparty/extract
#	thirdparty/freeglut
#	thirdparty/freetype
#	thirdparty/gumbo-parser
#	thirdparty/harfbuzz
#	thirdparty/jbig2dec
#	thirdparty/lcms2
#	thirdparty/leptonica
#	thirdparty/libpng
#	thirdparty/libtiff
#	thirdparty/mujs
#	thirdparty/openjpeg
#	thirdparty/tesseract
#	thirdparty/zlib
  • Loading branch information
GerHobbelt committed Dec 6, 2022
2 parents b6bed47 + ee77e16 commit af03f58
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit af03f58

Please sign in to comment.