[gambas2/f17: 2/2] Merge branch 'f17' of ssh://pkgs.fedoraproject.org/gambas2 into f17

[Tom Callaway]

commit 9cfb707460d45ad2529fd8fd33db7142dcda4636
Merge: a18dc34 f071f00
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Fri May 25 16:33:19 2012 -0400

    Merge branch 'f17' of ssh://pkgs.fedoraproject.org/gambas2 into f17
    
    Conflicts:
    	gambas2.spec

 gambas2.spec |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
---
diff --cc gambas2.spec
index ec3486f,bcf7a45..e1f835d
--- a/gambas2.spec
+++ b/gambas2.spec
@@@ -1608,9 -1612,14 +1608,17 @@@ update-mime-database %{_datadir}/mime &
  %{_datadir}/%{name}/info/gb.xml.xslt.*
  
  %changelog
 +* Fri May 25 2012 Tom Callaway <spot at fedoraproject.org> - 2.24.0-1
 +- update to 2.24.0
 +
+ * Mon Feb 27 2012 Tom Callaway <spot at fedoraproject.org> - 2.23.1-10
+ - drop conflicting mimetype definitions from gambas2 (gambas3 has identical defs, except they invoke gbs3)
+   Resolves bugzilla 797826
+ 
+ * Fri Feb 10 2012 Petr Pisar <ppisar at redhat.com> - 2.23.1-9
+ - Rebuild against PCRE 8.30
+ - Adjust to glib/poppler-features.h move into poppler-glib-devel sub-package
+ 
  * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.23.1-8
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild