[gd: 3/3] conflict resoved

[Jan Horak]

commit d750b13f4ee53bf7d4d9f0e9e391bee49aabf786
Merge: c41d610 6e18ec2
Author: Honza Horák <hhorak at redhat.com>
Date:   Tue Feb 28 14:10:16 2012 +0100

    conflict resoved

 gd.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --cc gd.spec
index bce9696,3806cab..b1e1bcb
--- a/gd.spec
+++ b/gd.spec
@@@ -1,7 -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:       15%{?dist}
++Release:       16%{?dist}
  Group:         System Environment/Libraries
  License:       MIT
  URL:           http://www.libgd.org/Main_Page
@@@ -99,10 -99,12 +99,16 @@@ rm -rf $RPM_BUILD_ROO
  %{_libdir}/pkgconfig/gdlib.pc
  
  %changelog
- * Tue Feb 28 2012 Honza Horak <hhorak at redhat.com> - 2.0.35-14
++* Tue Feb 28 2012 Honza Horak <hhorak at 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 at lists.fedoraproject.org> - 2.0.35-15
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
+ * Tue Nov 08 2011 Adam Jackson <ajax at redhat.com> 2.0.35-14
+ - Rebuild for libpng 1.5
+ 
  * Wed Oct 26 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.35-13
  - Rebuilt for glibc bug#747377