[wxsqlite3/f20: 13/13] <<<<<<< HEAD

[Martin Gansser]

commit 274c526732e0b16399927a8de8fb211ea3d76114
Merge: b4edf86 004f1df
Author: Martin Gansser <mgansser at alice.de>
Date:   Sun Jan 4 12:47:22 2015 +0100

    <<<<<<< HEAD

 .gitignore     |    1 +
 clog           |    3 +--
 sources        |    2 +-
 wxsqlite3.spec |   19 +++++++++++++++++++
 4 files changed, 22 insertions(+), 3 deletions(-)
---
diff --cc clog
index 506478c,0000000..7809fe1
mode 100644,000000..100644
--- a/clog
+++ b/clog
@@@ -1,3 -1,0 +1,2 @@@
- update to 3.1.1
++<<<<<<< HEAD
 +
- - added absolute path for wx-config
diff --cc wxsqlite3.spec
index f4c9ed5,5dee947..3466d7e
--- a/wxsqlite3.spec
+++ b/wxsqlite3.spec
@@@ -2,7 -2,7 +2,11 @@@
  %global wxincdir %{_includedir}/wx-%{wxversion}
  
  Name:           wxsqlite3
++<<<<<<< HEAD
 +Version:        3.1.1
++=======
+ Version:        3.2.0
++>>>>>>> master
  Release:        1%{?dist}
  Summary:        C++ wrapper around the SQLite 3.x database
  
@@@ -86,7 -86,7 +90,11 @@@ find $RPM_BUILD_ROOT -name '*.la' -exe
  
  # install own Debian-compatible pkgconfig file
  mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig
++<<<<<<< HEAD
 +sed -e "s!@VERSION@!3.1.1!" \
++=======
+ sed -e "s!@VERSION@!3.2.0!" \
++>>>>>>> master
  	-e "s!@LIBDIR@!%{_lib}!" \
  	-e "s!@WXVERSION@!%{wxversion}!g" \
          %{SOURCE1} > $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}-%{wxversion}.pc
@@@ -111,9 -111,14 +119,20 @@@
  
  
  %changelog
++<<<<<<< HEAD
 +* Mon Jun 30 2014 Martin Gansser <martinkg at fedoraproject.org> 3.1.1-1
 +- update to 3.1.1
 +- added absolute path for wx-config
++=======
+ * Sun Jan 04 2015 Martin Gansser <martinkg at fedoraproject.org> 3.2.0-1
+ - update to 3.2.0
+ 
+ * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.1-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+ 
+ * Mon Jun 30 2014 Martin Gansser <martinkg at fedoraproject.org> 3.1.1-1
+ - update to 3.1.1
++>>>>>>> master
  
  * Mon Jun 02 2014 Martin Gansser <martinkg at fedoraproject.org> 3.1.0-2
  - dropped CXXFLAGS to avoid compiler warnings