[marco/f20: 4/4] update to 1.8.2

[Wolfgang Ulbrich]

commit d3db566cadde1f5f7437596ab9764a74a7cdac51
Merge: ae72c0c 3a67ede
Author: raveit65 <chat-to-me at raveit.de>
Date:   Tue Sep 30 19:17:13 2014 +0200

    update to 1.8.2

 .gitignore |    4 ++++
 marco.spec |    5 ++++-
 sources    |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index 5f603e4,c028994..9501498
--- a/.gitignore
+++ b/.gitignore
@@@ -4,4 -4,4 +4,8 @@@
  /marco-1.7.90.tar.xz
  /marco-1.8.0.tar.xz
  /marco-1.8.1.tar.xz
++<<<<<<< HEAD
 +/marco-1.9.1.tar.xz
++=======
+ /marco-1.8.2.tar.xz
++>>>>>>> f21
diff --cc marco.spec
index a5c1ba1,b51eb65..74bc119
--- a/marco.spec
+++ b/marco.spec
@@@ -163,10 -163,17 +163,13 @@@ f
  
  
  %changelog
 -* Tue Sep 30 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.1-2
++* Tue Sep 30 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.2-1
+ - update to 1.8.2 release
+ 
 -* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.1-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 +* Sun Jul 27 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.1-1
 +- build Mate-1.8 for f20
  
 -* Sun Jun 29 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.1-1
 -- update to 1.8.1 release
 -- remove upstreamed patch
 -
 -* Fri Jun 20 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.0-4
 +* Fri Jun 20 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.0-3
  - add marco_ignore-adding-a-window-if-already-present.patch
  - from upstream, fix hopefully rhbz (#1109528)