# Conflicts: # source/packages/png/PngFunctions.pas Source commit: df4aba07100cd69dd1daf3fe5bb6acd6b0c01dd4
Martin Prikryl