diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2016-04-19 18:04:03 -0400 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2016-04-28 19:01:36 +0000 |
| commit | fc5767418cae4004d9286944d464b69e3f23420a (patch) | |
| tree | 96b85595fef764a0382813d972989d35ad92a4c2 /packaging/nsis | |
| parent | c954b1cefca7a34e06c71bcf59a2a0ee75f7cb1d (diff) | |
Register Wireshark as the reader of mplog files on freedesktop, OS X, and Windows.
(Doing this for freedesktop.org-compliant systems requires adding a MIME type;
yes, I just made the application/x-micropross-mplog MIME type up.)
Change-Id: I11d8cc22571dd39984f8237d0ef995922bdfd15f
Reviewed-on: https://code.wireshark.org/review/15012
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Diffstat (limited to 'packaging/nsis')
| -rw-r--r-- | packaging/nsis/AdditionalTasksPage.ini | 2 | ||||
| -rwxr-xr-x | packaging/nsis/common.nsh | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/packaging/nsis/AdditionalTasksPage.ini b/packaging/nsis/AdditionalTasksPage.ini index fabef34c07..34ac014ef4 100644 --- a/packaging/nsis/AdditionalTasksPage.ini +++ b/packaging/nsis/AdditionalTasksPage.ini @@ -113,7 +113,7 @@ Left=10 Right=280 Top=120 Bottom=128 -Text=Extensions: 5vw, acp, apc, atc, bfr, cap, enc, erf, fdc, out, pcap, +Text=Extensions: 5vw, acp, apc, atc, bfr, cap, enc, erf, fdc, mplog, out, pcap, [Field 13] Type=Label diff --git a/packaging/nsis/common.nsh b/packaging/nsis/common.nsh index d87d2009fd..d84434141e 100755 --- a/packaging/nsis/common.nsh +++ b/packaging/nsis/common.nsh @@ -118,6 +118,7 @@ Exec '"$SYSDIR\ie4uinit.exe" -ClearIconCache' Push ".apc" Push ".acp" Push ".5vw" + Push ".mplog" !macroend !macro IsWiresharkRunning |