Wireshark-commits: [Wireshark-commits] master-2.2 f46f367: Update c-ares to 1.12.0

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Thu, 29 Sep 2016 21:52:41 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=f46f3673e59a66c615561b50127fcccea50558e7
Submitter: Pascal Quantin (pascal.quantin@xxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

f46f367 by Pascal Quantin (pascal.quantin@xxxxxxxxx):

    Update c-ares to 1.12.0
    
    Change-Id: Icd70f5e4e5e1a41a6a188500874a893433ecb8ed
    Reviewed-on: https://code.wireshark.org/review/17985
    Petri-Dish: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    (cherry picked from commit d8a2d39d429ad20707eafc05399e640521d66f57)
    Conflicts:
    	tools/win-setup.ps1
    Reviewed-on: https://code.wireshark.org/review/17986
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    

Actions performed:

    from  f78d1ad   tshark: register extcap preferences
    adds  f46f367   Update c-ares to 1.12.0


Summary of changes:
 tools/win-setup.ps1 |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)