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

Conflicts:
	libpng.3
	png.h
This commit is contained in:
Glenn Randers-Pehrson 2012-09-27 06:33:43 -05:00
commit 753fd3f2cd

Diff Content Not Available