[adobe-source-sans-pro-fonts: 3/3] Merge branch 'master' of ssh://pkgs.fedoraproject.org/adobe-source-sans-pro-fonts

[Lameire Alexis]

commit 0630206d4565e6a46c06c2614858d11bdfb21d77
Merge: f75d116 c3593da
Author: Alexis Lameire <alexisis-pristontale at hotmail.com>
Date:   Mon Apr 29 19:31:34 2013 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/adobe-source-sans-pro-fonts
    
    Conflicts:
    	adobe-source-sans-pro-fonts.spec

 adobe-source-sans-pro-fonts.spec |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
---
diff --cc adobe-source-sans-pro-fonts.spec
index fabf3fa,6347528..434adcf
--- a/adobe-source-sans-pro-fonts.spec
+++ b/adobe-source-sans-pro-fonts.spec
@@@ -2,8 -2,8 +2,13 @@@
  %global fontconf 63-%{fontname}.conf
  
  Name:           adobe-source-sans-pro-fonts
++<<<<<<< HEAD
 +Version:        1.050
 +Release:        1%{?dist}
++=======
+ Version:        1.034
+ Release:        2%{?dist}
++>>>>>>> c3593daf230c18c041fb03b3cd928d69d732940e
  Summary:        A set of OpenType fonts designed for user interfaces
  
  License:        OFL
@@@ -48,9 -48,9 +53,12 @@@ ln -s %{_fontconfig_templatedir}/%{font
  
  
  %changelog
 +* Mon Apr 29 2013 Alexis Lameire <alexisis-pristontale at hotmail.com> - 1.050-1
 +- update to 1.050-1 upstream release
 +
+ * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.034-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
  * Wed Aug 29 2012 Alexis Lameire <alexisis-pristontale at hotmail.com> - 1.034-1
  - update to 1.034-1 upstream release