[ettercap/el6: 17/17] Merge branch 'master' into el6
Jon Ciesla
limb at fedoraproject.org
Thu Jan 26 19:57:33 UTC 2012
commit 72f3f802d8afbecfba5986a64b2c20cc0298ac11
Merge: 80af6f7 6b2e325
Author: Jon Ciesla <limburgher at gmail.com>
Date: Thu Jan 26 13:57:21 2012 -0600
Merge branch 'master' into el6
Conflicts:
ettercap.spec
.gitignore | 1 +
ettercap-0.7.4-CVE-2010-3843.patch | 37 ++++++++++++++++++++++
ettercap-NG-0.7.3-license-fix.patch | 12 +++++++
ettercap-NG-0.7.3-passive-dns.patch | 49 +++++++++++++++++++++++++++++
ettercap.spec | 59 +++++++++++++++++++++++++++++-----
ettercap_easter_egg_license.txt | 56 +++++++++++++++++++++++++++++++++
sources | 2 +-
7 files changed, 206 insertions(+), 10 deletions(-)
---
More information about the scm-commits
mailing list