[gifsicle/el6: 20/20] Update to 1.70 from master

[Orion Poplawski]

commit 3255a3bc6336885553f12e3e661c34b97faad392
Merge: 938fde2 817bb8c
Author: Orion Poplawski <orion at nwra.com>
Date:   Mon Feb 4 10:33:05 2013 -0700

    Update to 1.70 from master

 .gitignore    |   11 +++++++++++
 gifsicle.spec |   13 +++++++------
 sources       |    4 ++++
 3 files changed, 22 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index cca5cc8,c4032fc..b8f20b7
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,9 +1,12 @@@
  gifsicle-1.60.tar.gz
++<<<<<<< HEAD
++=======
+ /gifsicle-1.61.tar.gz
+ /gifsicle-1.62.tar.gz
+ /gifsicle-1.63.tar.gz
+ /gifsicle-1.64.tar.gz
+ /gifsicle-1.66.tar.gz
+ /gifsicle-1.67.tar.gz
+ /gifsicle-1.68.tar.gz
+ /gifsicle-1.70.tar.gz
++>>>>>>> master
diff --cc gifsicle.spec
index 17afccc,4710ea0..daf869c
--- a/gifsicle.spec
+++ b/gifsicle.spec
@@@ -79,6 -75,43 +75,11 @@@ make install DESTDIR=$RPM_BUILD_ROO
  
  
  %changelog
+ * Mon Feb 4 2013 - Orion Poplawski <orion at cora.nwra.com> - 1.70-1
+ - Update to 1.70
+ - Some spec cleanup
 -
 -* Mon Nov 26 2012 - Orion Poplawski <orion at cora.nwra.com> - 1.68-1
 -- Update to 1.68
 -
 -* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.67-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 -
 -* Fri May 11 2012 - Orion Poplawski <orion at cora.nwra.com> - 1.67-1
 -- Update to 1.67
 -
 -* Tue Apr 3 2012 - Orion Poplawski <orion at cora.nwra.com> - 1.66-1
 -- Update to 1.66
 -
 -* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.64-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 -
 -* Wed Nov 23 2011 - Orion Poplawski <orion at cora.nwra.com> - 1.64-1
 -- Update to 1.64
 -
 -* Thu Jul 21 2011 - Orion Poplawski <orion at cora.nwra.com> - 1.63-1
 -- Update to 1.63
 -
 -* Tue Apr 5 2011 - Orion Poplawski <orion at cora.nwra.com> - 1.62-1
 -- Update to 1.62
 -
 -* Mon Feb 28 2011 - Orion Poplawski <orion at cora.nwra.com> - 1.61-1
 -- Update to 1.61
 -
 -* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.60-3
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 -
 -* Fri Jul 30 2010 - Orion Poplawski <orion at cora.nwra.com> - 1.60-2
+ - Add license to gifview package
+ 
  * Tue Apr 13 2010 - Orion Poplawski <orion at cora.nwra.com> - 1.60-1
  - Update to 1.60
  
diff --cc sources
index b7e3bb3,cded602..1ba3027
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +2629d5894e189e251f148eec8e7805d6  gifsicle-1.60.tar.gz
++=======
+ b48eb454fcd03d1a1c726443e430b90b  gifsicle-1.70.tar.gz
++>>>>>>> master