[perl-Config-Generator: 2/2] Syncronization with upstream sources, release 0.7

[Alexandre Beche]

commit 2cb5edda431b1922307112c6110eb0505ac47a7c
Merge: 1889f60 81a2278
Author: Alexandre Beche <alexandre.beche at gmail.com>
Date:   Tue Apr 29 13:46:21 2014 +0200

    Syncronization with upstream sources, release 0.7

 .gitignore                 |    1 +
 perl-Config-Generator.spec |   12 ++++++++++++
 sources                    |    2 +-
 3 files changed, 14 insertions(+), 1 deletions(-)
---
diff --cc perl-Config-Generator.spec
index 928b3c6,b422508..3c31689
--- a/perl-Config-Generator.spec
+++ b/perl-Config-Generator.spec
@@@ -1,7 -1,7 +1,13 @@@
  Name:           perl-Config-Generator
++<<<<<<< HEAD
 +Version:        0.5
 +Release:        2%{?dist}
 +Summary:        General purpose configuration generator
++=======
+ Version:        0.7
+ Release:        1%{?dist}
+ Summary:        Shared variables for the Config::Generator modules
++>>>>>>> el6
  License:        GPL+ or Artistic
  Group:          Development/Libraries
  URL:            http://search.cpan.org/dist/Config-Generator/
@@@ -54,8 -54,9 +60,14 @@@ rm -rf $RPM_BUILD_ROO
  %{_mandir}/man3/*
  
  %changelog
++<<<<<<< HEAD
 +* Thu Mar 27 2014 Alexandre Beche <alexandre.beche at gmail.com> 0.5-2
 +- minor change to specfile: Summary and description changed.
++=======
+ * Tue Apr 29 2014 Alexandre Beche <alexandre.beche at gmail.com> 0.7-1
+ - Added an example of a wrapper script in the "eg" directory.
+ - Config::Generator::Template: added ifdef() and ifndef() macros.
++>>>>>>> el6
  
  * Thu Feb 20 2014 Alexandre Beche <alexandre.beche at gmail.com> 0.5-1
  - Specfile autogenerated by cpanspec 1.78.