Merge remote-tracking branch 'origin/f16' into f17

Conflicts: .gitignore pigz.spec sources
2012-03-14 09:41:03 +01:00 · 2012-03-14 09:41:03 +01:00 · e7161b5c28
commit e7161b5c28
parent e898bec695 47d0912b76
3 changed files with 6 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,3 @@
 pigz-2.1.6.tar.gz
 /pigz-2.2.3.tar.gz
+/pigz-2.2.4.tar.gz
--- a/pigz.spec
+++ b/pigz.spec
@ -1,5 +1,5 @@
 Name:           pigz
-Version:        2.2.3
+Version:        2.2.4
 Release:        1%{?dist}
 Summary:        Parallel implementation of gzip

@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT


 %changelog
+* Wed Mar 14 2012 Adel Gadllah <adel.gadllah@gmail.com> - 2.2.4-1
+- New upstream release
+
 * Wed Jan 18 2012 Adel Gadllah <adel.gadllah@gmail.com> - 2.2.3-1
 - New upstream release

--- a/2
+++ b/2
@ -1 +1 @@
-8330a6c6a3e5f1954687aaba4b973a6f  pigz-2.2.3.tar.gz
+9df2a3c742524446fa4e797c17e8fd85  pigz-2.2.4.tar.gz