[gabedit/f14/master: 5/5] Merge branch 'f13' into f14

[Dominik Mierzejewski]

commit f28a0744cc32b60be1e408cbba206036f591ee74
Merge: c0355aa ca94e97
Author: Dominik Mierzejewski <dominik at greysector.net>
Date:   Thu Aug 26 22:33:11 2010 +0200

    Merge branch 'f13' into f14
    
    Conflicts:
    	gabedit-gtk.patch
    	gabedit.spec
    
    Rebase gtk patch

 gabedit-gtk.patch |   90 ++++++++++++++++++++++++++--------------------------
 gabedit.spec      |    3 +-
 2 files changed, 47 insertions(+), 46 deletions(-)
---
diff --cc gabedit.spec
index 29d23e3,11290ef..e558b8e
--- a/gabedit.spec
+++ b/gabedit.spec
@@@ -87,13 -85,9 +87,14 @@@ f
  %{_datadir}/icons/hicolor/*/apps/*.png
  
  %changelog
- * Mon Aug 23 2010 Dominik Mierzejewski <rpm at greysector.net> 2.3.0-1
+ * Thu Aug 26 2010 Dominik Mierzejewski <rpm at greysector.net> 2.3.0-1
  - updated to latest stable version (2.3.0)
 -- fixed build with current F13 GTK2
++- rebased gtk patch
 +
 +* Mon May 24 2010 Dominik Mierzejewski <rpm at greysector.net> 2.2.12-1
 +- updated to latest development version (2.2.12)
 +- fixed build with gtk2-2.20 (replaced deprecated macro calls)
 +- fixed wrong end-of-line-encoding rpmlint warning
  
  * Mon Feb 15 2010 Dominik Mierzejewski <rpm at greysector.net> 2.2.9-2
  - fixed FTBFS with the new ld (rhbz#564993)