commit | 902dbe619ea8bb4bd54a3857c1b2d0b4c31d48dc | [log] [tgz] |
---|---|---|
author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | Tue Jan 31 23:22:09 2012 -0600 |
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | Tue Jan 31 23:22:09 2012 -0600 |
tree | b9055c90db4f3a5c46c820b937cbeb49e9877cc5 | |
parent | 0f59bbb5b681b9d13772e120c57ad18b792577c0 [diff] | |
parent | 9ca5f1bdc800788e523c4b96c8abbef2e1d77f47 [diff] |
Merge branch 'libpng15' of ssh://libpng.git.sourceforge.net/gitroot/libpng/libpng into libpng15 Conflicts: ANNOUNCE