diff options
| author | Danny Rawlins <monster.romster@gmail.com> | 2014-04-23 21:25:01 +1000 |
|---|---|---|
| committer | Danny Rawlins <monster.romster@gmail.com> | 2014-05-03 21:16:32 +1000 |
| commit | ca15e81643990efec16020db9659de691083bcd5 (patch) | |
| tree | 5c7bcb734f097c9cdbd203d937f88827957ce510 /libpng-32 | |
| parent | d95d8d2c6929d9ce767d8dbc3051856a1b0957d6 (diff) | |
| download | compat-32-ca15e81643990efec16020db9659de691083bcd5.tar.gz compat-32-ca15e81643990efec16020db9659de691083bcd5.tar.xz | |
libpng-32: 1.5.17 -> 1.5.18
Diffstat (limited to 'libpng-32')
| -rw-r--r-- | libpng-32/.md5sum | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libpng-32/.md5sum b/libpng-32/.md5sum index dfc5322e..57babe11 100644 --- a/libpng-32/.md5sum +++ b/libpng-32/.md5sum @@ -1,2 +1,7 @@ +<<<<<<< HEAD 3404257f66d4a118b26ccc3fc4788810 libpng-1.6.10-apng.patch.gz 5f414b20f683b1d96b163c89e3eff768 libpng-1.6.10.tar.xz +======= +92b457d42c0c6ae4dd2bc8876be19488 libpng-1.5.18-apng.patch.gz +23fb6a0e9f4dbaab7b34b6fd317a4f2d libpng-1.5.18.tar.xz +>>>>>>> libpng-32: 1.5.17 -> 1.5.18 |