From d750b13f4ee53bf7d4d9f0e9e391bee49aabf786 Mon Sep 17 00:00:00 2001
From: Honza Horák <hhorak@redhat.com>
Date: Feb 28 2012 13:10:16 +0000
Subject: conflict resoved


---

diff --git a/gd.spec b/gd.spec
index bce9696..b1e1bcb 100644
--- a/gd.spec
+++ b/gd.spec
@@ -1,7 +1,7 @@
 Summary:       A graphics library for quick creation of PNG or JPEG images
 Name:          gd
 Version:       2.0.35
-Release:       14%{?dist}
+Release:       16%{?dist}
 Group:         System Environment/Libraries
 License:       MIT
 URL:           http://www.libgd.org/Main_Page
@@ -99,10 +99,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/gdlib.pc
 
 %changelog
-* Tue Feb 28 2012 Honza Horak <hhorak@redhat.com> - 2.0.35-14
+* Tue Feb 28 2012 Honza Horak <hhorak@redhat.com> - 2.0.35-16
 - Fixed AALineThick.patch to display vertical lines correctly
   Resolves: #798255
 
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.35-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Nov 08 2011 Adam Jackson <ajax@redhat.com> 2.0.35-14
+- Rebuild for libpng 1.5
+
 * Wed Oct 26 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.35-13
 - Rebuilt for glibc bug#747377