[xfwm4/el6: 11/11] Merge remote-tracking branch 'origin/master' into el6 Update to 4.8.3

[Kevin Fenzi]

commit 0bfc692f21ce90adeac65b7f56541d8094bddcca
Merge: 1f220df 7b2636a
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Mon Dec 19 15:21:41 2011 -0700

    Merge remote-tracking branch 'origin/master' into el6
    Update to 4.8.3

 .gitignore |    2 ++
 sources    |    2 +-
 xfwm4.spec |   26 +++++++++++++++++++++-----
 3 files changed, 24 insertions(+), 6 deletions(-)
---
diff --cc xfwm4.spec
index d70c1ef,fb14d78..cecf821
--- a/xfwm4.spec
+++ b/xfwm4.spec
@@@ -34,9 -34,9 +34,8 @@@ xfwm4 is a window manager compatible wi
  # use Nodoka Theme in Fedora
  %if 0%{?fedora}
  %patch0 -p1 -b .nodoka
 -%endif
 -
 +%endif 
  
- 
  %build
  %configure  --disable-static
  
@@@ -90,9 -90,23 +89,26 @@@ gtk-update-icon-cache %{_datadir}/icons
  
  
  %changelog
+ * Mon Dec 19 2011 Kevin Fenzi <kevin at scrye.com> - 4.8.3-1
+ - Update to 4.8.3
+ 
+ * Tue Nov 01 2011 Christoph Wickert <cwickert at fedoraproject.org> - 4.8.2-1
+ - Update to 4.8.2
+ - Remove all upstreamed patches
+ - Apply Nodoka theme only in Fedora
+ 
+ * Tue Nov 01 2011 Christoph Wickert <cwickert at fedoraproject.org> - 4.8.1-5
+ - Provide window manager for firstboot (#750397)
+ 
+ * Sat Oct 15 2011 Christoph Wickert <cwickert at fedoraproject.org> - 4.8.1-4
+ - Another patch to fix resizing (#670173)
+ 
 +* Thu Oct 4 2011 Orion Poplawski <orion at cora.nwra.com> - 4.8.1-3
 +- Only use nodoka theme in Fedora, no EPEL
 +
+ * Mon Sep 19 2011 Christoph Wickert <cwickert at fedoraproject.org> - 4.8.1-3
+ - Be less strict on size changes (#670173)
+ 
  * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.8.1-2
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild