git.samba.org / obnox / wireshark / wip.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 915bd43) | patch
When merging, default to the current file format as the output format.
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 17 Oct 2004 03:11:31 +0000 (03:11 +0000)
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 17 Oct 2004 03:11:31 +0000 (03:11 +0000)
commit4e3bfb9b873a68bb59946931175b9e24560c19f9
treef3190c391d12b6d886e36e6ee7cb5898a297745atree
parent915bd4358e5c47acfad828b8161bf3ac35dc6581commit | diff
When merging, default to the current file format as the output format.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@12327 f5534014-38df-0310-8fa8-9805f1628bb7
gtk/file_dlg.c diff | blob | history
git mirror of the wireshark svn