tree 6e2316181950ab0d807e941e75b5d1334c768cce
parent eddf9023206dc40974c26f589ee2ad63a4227a1e
parent 85acd919b954fc7551ecb56e7fe8c99e321b49f3
author Cosmin Truta <ctruta@gmail.com> 1543674960 -0500
committer Cosmin Truta <ctruta@gmail.com> 1543674960 -0500

Join the branches 'libpng16' and 'master'

The branch 'libpng16' is for tracking libpng version 1.6.x.
The branch 'master' is for tracking the latest stable libpng version.

These branches will diverge again at the next major libpng upgrade.