aboutsummaryrefslogtreecommitdiffstats
path: root/merge.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2004-10-28 22:06:55 +0000
committerGerald Combs <gerald@wireshark.org>2004-10-28 22:06:55 +0000
commit24f30a8850a1f11ae2470fd5124e827f443fa62b (patch)
treebe8e613482626efd38c3c9d08cef55bdfb5d0051 /merge.c
parentbef8e01fcdfb99155406d7b53500f4764dffbc1a (diff)
Add support for pkauthdata and pkdhkeydata OIDs.
svn path=/trunk/; revision=12426
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions