[p7zip/el5: 21/21] Merge branch 'master' into el5

Tue Jul 26 16:06:41 UTC 2011

commit 31a214780a10a099f67e850902b62f550479bcec
Merge: 33174a6 1cadb4f
Author: Matthias Saou <matthias at saou.eu>
Date:   Tue Jul 26 18:06:16 2011 +0200

    Merge branch 'master' into el5

 .gitignore                                         |    3 +-
 p7zip.spec                                         |  100 +++++++++-----
 p7zip_4.51-nostrip.patch                           |   24 ----
 p7zip_4.61-norar.patch                             |  140 --------------------
 p7zip_9.20.1-execstack.patch                       |   24 ++++
 ....58-install.patch => p7zip_9.20.1-install.patch |   87 +++---------
 p7zip_9.20.1-norar.patch                           |  102 ++++++++++++++
 p7zip_9.20.1-nostrip.patch                         |   24 ++++
 sources                                            |    2 +-
 9 files changed, 241 insertions(+), 265 deletions(-)
---