tree feca7c08c8b623f94324d3898b15977dcf36406c
parent a50ce74850be95c5002d5b1dc12169d97d607881
parent 8973ee17bbb90dc94bf1c8f0f3a2bd92370a6ef0
author Glenn Randers-Pehrson <glennrp at users.sourceforge.net> 1322752110 -0600
committer Glenn Randers-Pehrson <glennrp at users.sourceforge.net> 1322752110 -0600

Merge branch 'libpng15' of ssh://www.simplesystems.org/git/libpng into libpng15