[caja-actions/f20: 19/19] fix merge conflicts

[Wolfgang Ulbrich]

commit ed5a698ea224a95ac6c0e2b22ce79e4ee5e60781
Merge: 6ab6f40 fffd446
Author: raveit65 <chat-to-me at raveit.de>
Date:   Fri Jan 30 04:47:01 2015 +0100

    fix merge conflicts

 .gitignore        |    6 ++++++
 caja-actions.spec |   48 ++++++++++++++++++++++++------------------------
 sources           |    4 ++++
 3 files changed, 34 insertions(+), 24 deletions(-)
---
diff --cc .gitignore
index 32232ce,e233bfc..ebaece6
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,4 +1,9 @@@
  /caja-actions-1.6.2.tar.gz
++<<<<<<< HEAD
 +/caja-actions-1.6.3.tar.xz
 +/caja-actions-1.7.1.tar.xz
++=======
+ /caja-actions-1.7.0.tar.gz
+ /caja-actions-1.7.1.tar.xz
+ /caja-actions-1.8.0.tar.xz
++>>>>>>> f21
diff --cc caja-actions.spec
index f6ec742,da59e2e..d40a021
--- a/caja-actions.spec
+++ b/caja-actions.spec
@@@ -141,19 -125,35 +125,35 @@@ f
  
  
  %changelog
- * Sun Jul 27 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.7.1-3
+ * Fri Jan 30 2015 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.0-1
+ - update to 1.8.0 release
+ - fix english and non translated help
+ 
 -* Fri Aug 15 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.1-4
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 -
 -* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.1-3
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 -
+ * Thu May 01 2014 Kalev Lember <kalevlember at gmail.com> - 1.7.1-2
+ - Rebuilt for libgtop2 soname bump
+ 
+ * Sun Mar 16 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.7.1-1
  - update to 1.7.1 release
- - update build requires
- - update configure flag
- - add --with-gnome --all-name for find language
- - update file section
+ - improve help documents
+ - move docs to main package
+ 
+ * Sun Mar 16 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.7.0-1
+ - add 1.7.0 release
+ - use yelp-tools, help is working now
+ - use --enable-gtk-docs, remove --disable-srollkepper
+ - use --enable-deprecated
+ - move find language to -doc subpackage, and use --with-gnome --all-name
+ - move gtk-docs to -devel subpackage
+ - remove changelog-2012
+ - add BR dblatex
+ - update configure flags
  
 +* Sun Mar 16 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.3-1
 +- update to 1.6.3 release
 +- update configure flags
 +- move gtk-docs to -devel subpackage
 +- remove ChangeLog-2012
 +
  * Wed Dec 18 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.2-2
  - update for rename caja in f21
  
diff --cc sources
index 4464db3,207c2a2..91abf51
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +2438119c10216f5444857cc75e5b47c9  caja-actions-1.7.1.tar.xz
++=======
+ da0ed87d0c1e47ae93798d30471ff300  caja-actions-1.8.0.tar.xz
++>>>>>>> f21