summaryrefslogtreecommitdiff
path: root/docbook
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2012-09-06 22:58:39 +0000
committerGerald Combs <gerald@wireshark.org>2012-09-06 22:58:39 +0000
commit2bda67e82e64510bb254999a90404009b19a3ce4 (patch)
tree262bfefa5e13ffddcfe0480877d0ce2e53af4be5 /docbook
parent4333dd03f4e3a669bf93e3d0fbcd1905493cb3c9 (diff)
downloadwireshark-2bda67e82e64510bb254999a90404009b19a3ce4.tar.gz
Implement File→Merge.
The GTK+ and native Win32 versions are slightly different. The GTK+ version lets you select an output file type and the Win32 version uses the existing capture filetype. We do the latter for now. Start documenting significant UI changes in README.qt. This might be better handled on the wiki. svn path=/trunk/; revision=44797
Diffstat (limited to 'docbook')
0 files changed, 0 insertions, 0 deletions