[rawtherapee: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/rawtherapee

[Thibault North]

commit 3474870959b52ad9646489850615263d60a9e699
Merge: 872a648 293ecd8
Author: Thibault North <tnorth at fedoraproject.org>
Date:   Sun Mar 20 12:46:07 2011 -0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/rawtherapee
    
    Conflicts:
    	rawtherapee.spec

 rawtherapee.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc rawtherapee.spec
index c59ad41,ef3b0e1..a02f806
--- a/rawtherapee.spec
+++ b/rawtherapee.spec
@@@ -103,10 -113,9 +103,13 @@@ fi || 
  %{_datadir}/icons/hicolor/32x32/apps/rawtherapee.png
  
  %changelog
 +* Sun Mar 20 2011 Thibault North <tnorth at fedoraproject.org> - 3.0-0.28.a1
 +- Updated to 3.0A2, distance 13 for many fixes
 +- Updated spec file thanks to upstream fixes
 +
+ * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0-0.28.a1
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Mon Jan 3 2011 Thibault North <tnorth at fedoraproject.org> - 3.0-0.27.a1
  - Sync with upstream for various bugfixes and enhancements