[guiloader-c++: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/guiloader-c++

[Fabian Affolter]

commit 78e2b63182b5550ff1cc5e08d75c98c1eb858b47
Merge: 1a218a0 36b818a
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Sun Dec 11 10:46:17 2011 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/guiloader-c++
    
    Conflicts:
    	guiloader-c++.spec

 guiloader-c++.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc guiloader-c++.spec
index 6ba9e16,d88616b..0e5ff7e
--- a/guiloader-c++.spec
+++ b/guiloader-c++.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:           guiloader-c++
  Version:        2.99.0
--Release:        2%{?dist}
++Release:        3%{?dist}
  Summary:        C++ Binding to GuiLoader Library
  
  Group:          System Environment/Libraries
@@@ -77,9 -77,9 +77,12 @@@ rm -rf %{buildroot
  
  
  %changelog
- * Sun Dec 11 2011 Fabian Affolter <mail at fabian-affolter.ch> - 2.99-2
++* Sun Dec 11 2011 Fabian Affolter <mail at fabian-affolter.ch> - 2.99.0-3
 +- gtkmm24 is no longer current, gtkmm30 is needed
 +
+ * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 2.99.0-2
+ - Rebuild for new libpng
+ 
  * Sat Nov 26 2011 Fabian Affolter <mail at fabian-affolter.ch> - 2.99.0-1
  - Updated to new upstream version 2.99.0