[mingw-webkitgtk: 7/36] Merge branch 'master' of ssh://pkgs.fedoraproject.org/mingw32-webkitgtk

[Kalev Lember]

commit 8bca892e9d5ac764e57499d3fb5a9191ef5b5595
Merge: 0e0af15 53da9cc
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Thu Apr 28 00:21:09 2011 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/mingw32-webkitgtk
    
    Conflicts:
    	mingw32-webkitgtk.spec

 mingw32-webkitgtk.spec |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --cc mingw32-webkitgtk.spec
index 5185ef4,243e0d3..40487f3
--- a/mingw32-webkitgtk.spec
+++ b/mingw32-webkitgtk.spec
@@@ -220,15 -195,9 +220,15 @@@ install -m 755 Programs/.libs/GtkLaunch
  
  
  %changelog
 +* Wed Apr 27 2011 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.4.0-1
 +- Update to 1.4.0
 +- Drop upstreamed patches
- 
- * Wed Apr 20 2011 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.3.13-1
- - Update to 1.3.13
 +- Fixed compatibility with gcc 4.6
 +- Disabled spellchecking support for now as it breaks compilation
 +
+ * Fri Apr 22 2011 Kalev Lember <kalev at smartlink.ee> - 1.3.6-4
+ - Rebuilt for pseudo-reloc version mismatch (#698827)
+ 
  * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.6-3
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild