[wireshark/f20: 2/2] Merge branch 'master' into f20
Peter Lemenkov
peter at fedoraproject.org
Sat Nov 2 12:50:36 UTC 2013
commit 6ed694b7207ea7a0ebb3fc463379ee9e86d7593f
Merge: 6eb8b16 c06811f
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Sat Nov 2 16:50:35 2013 +0400
Merge branch 'master' into f20
.gitignore | 1 +
sources | 2 +-
wireshark-0001-enable-Lua-support.patch | 4 +-
...rk-0002-Customize-permission-denied-error.patch | 4 +-
...Load-correct-shared-object-name-in-python.patch | 4 +-
wireshark-0004-fix-documentation-build-error.patch | 4 +-
...05-fix-string-overrun-in-plugins-profinet.patch | 4 +-
...Lemenkov-via-https-bugs.wireshark.org-bug.patch | 15 +++--
...07-The-beginning-of-an-openflow-dissector.patch | 4 +-
wireshark-0008-adds-autoconf-macro-file.patch | 4 +-
...shark-0009-Restore-Fedora-specific-groups.patch | 4 +-
wireshark-0010-Add-pkgconfig-entry.patch | 6 +-
wireshark-0011-Install-autoconf-related-file.patch | 4 +-
...ve-default-temporary-directory-to-var-tmp.patch | 27 ++++++-
...ark-0013-Added-basic-conversation-support.patch | 4 +-
...port-of-r52142-and-r52144-to-fix-collisio.patch | 73 --------------------
wireshark.spec | 21 +++---
17 files changed, 68 insertions(+), 117 deletions(-)
---
More information about the scm-commits
mailing list