From Mark C. Brown: allow the file type for the merge operation to be
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 17 Oct 2004 02:53:26 +0000 (02:53 +0000)
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 17 Oct 2004 02:53:26 +0000 (02:53 +0000)
commit915bd4358e5c47acfad828b8161bf3ac35dc6581
tree86117c057484b03bfa27d0d967c023c9c3a6fa14
parent7c9ff7604e23e3e426284fa8e5226c939c64b044
From Mark C. Brown: allow the file type for the merge operation to be
specified in the GUI.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@12326 f5534014-38df-0310-8fa8-9805f1628bb7
gtk/file_dlg.c
gtk/main.c
merge.c
merge.h