tree 2a2763cabc4652206d394bc5ef4157c086494ff2
parent cd3f5bb5077dfef55951e65c231842e7bcaf97b4
parent b0270a9e4717fa2a9344576df6296e972294478f
author Glenn Randers-Pehrson <glennrp at users.sourceforge.net> 1323964440 -0600
committer Glenn Randers-Pehrson <glennrp at users.sourceforge.net> 1323964440 -0600

Merge branch 'libpng15' of ssh://libpng.git.sourceforge.net/gitroot/libpng/libpng into libpng15