[gtk-murrine-engine/f14/master: 4/4] Merge branch 'master' into f14/master

[Martin Sourada]

commit 0ff361215aa0ddc3fcf279cedf44dda2b87646aa
Merge: d8f759b 95e0a34
Author: Martin Sourada <mso at fedoraproject.org>
Date:   Mon Oct 11 11:14:23 2010 +0200

    Merge branch 'master' into f14/master
    
    Conflicts:
    	gtk-murrine-engine.spec
    
    fix merge conflict in changelog and one typo in date

 .gitignore              |    1 +
 gtk-murrine-engine.spec |   14 +++++++++-----
 sources                 |    2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)
---
diff --cc gtk-murrine-engine.spec
index 39b82b8,1bea8de..641ad9b
--- a/gtk-murrine-engine.spec
+++ b/gtk-murrine-engine.spec
@@@ -57,11 -57,15 +57,15 @@@ rm -rf $RPM_BUILD_ROO
  %{_datadir}/themes/*
  
  %changelog
- * Mon Oct 08 2010 Martin Sourada <mso at fedoraproject.org> - 0.98.0-1
+ * Mon Oct 11 2010 Martin Sourada <mso at fedoraproject.org> - 0.98.1.1-1
+ - Update to 0.98.1.1
+ - License change to LGPLv2.1 and LGPLv3
+ 
 -* Wed Sep 29 2010 jkeating - 0.98.0-2
 -- Rebuilt for gcc bug 634757
++* Mon Oct 11 2010 Martin Sourada <mso at fedoraproject.org> - 0.98.0-1
 +- Update to 0.98.0 
  
 -* Thu Sep 23 2010 Martin Sourada <mso at fedoraproject.org> - 0.98.0-1
 -- Update to 0.98.0
 +* Wed Sep 29 2010 jkeating - 0.90.3-3.1
 +- Rebuilt for gcc bug 634757
  
  * Thu Nov 12 2009 Martin Sourada <mso at fedoraproject.org> - 0.90.3-3
  - Don't own %%{_datadir}/themes