diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-05-04 23:13:04 +0200 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2015-05-10 15:57:23 +0000 |
| commit | 4263c131a4eb1e2917bba4ae3bfc47409c84fe11 (patch) | |
| tree | 25cc511208c48702a2d733a817a653eeb148061b /ui/qt/capture_interfaces_dialog.ui | |
| parent | b230a033067213e5410c8ed5600d4c7d495e535f (diff) | |
mergecap: fix merge of files with different encapsulation types
Issue reported on https://ask.wireshark.org/questions/42061/merging-captures-on-1995
Change-Id: I0697a03221972f2d1616da52aecc6257f0bc5b88
Reviewed-on: https://code.wireshark.org/review/8293
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'ui/qt/capture_interfaces_dialog.ui')
0 files changed, 0 insertions, 0 deletions