Wireshark-commits: [Wireshark-commits] master-1.12 25bb29a: Windows packaging and release note upda

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Thu, 5 Jun 2014 23:33:41 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=25bb29a1d65896959bc3f73bcf20b400fe0d32dd
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

25bb29a by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Windows packaging and release note updates.
    
    Use "Wireshark" and "Wireshark 2 Preview" instead of "Wireshark (GTK+)"
    and "Wireshark (Qt)" respectively in the Windows installer. Shorten the
    descriptions of the command line tools. Warn against (but don't prohibit)
    installing on XP.
    
    Note that XP is deprecated and that 32-bit OS X and U3 are no longer
    supported.
    
    Change-Id: Ica37ffa5b04eb48cadf41842b6fb9b1431c69803
    Reviewed-on: https://code.wireshark.org/review/1988
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  77df529   Fix wireshark.pc install destination
    adds  25bb29a   Windows packaging and release note updates.


Summary of changes:
 docbook/release-notes.asciidoc         |   11 ++++++++-
 packaging/nsis/AdditionalTasksPage.ini |   34 +++++++++++++--------------
 packaging/nsis/common.nsh              |    8 +++----
 packaging/nsis/wireshark.nsi           |   40 ++++++++++++++++++--------------
 4 files changed, 54 insertions(+), 39 deletions(-)