TCP: fix no previous prototype for 'exp_pdu_tcp_dissector_data_size/exp_pdu_tcp_disse...
[metze/wireshark/wip.git] / ChangeLog
index 964657afeb8b1283f542267970ce2c19d44e3c4c..b96eaeee944505300a5610b1a38c76a628abeec8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
-commit a748e83
+commit d5f84c0
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Feb 4 08:53:44 2015 -0800
+Date:   Thu Jul 14 11:05:17 2016 -0700
 
-    Qt: Add "Copy As..." to the Protocol Hierarchy stats.
+    Build 2.1.1.
     
-    This implementation is slightly different compared to other dialogs
-    since we have nested items.
-    
-    Tweak the bar highlight color look better on Windows while we're here.
-    
-    Change-Id: If0607c4624f304042fe3d6c8a941756b342e703d
-    Reviewed-on: https://code.wireshark.org/review/6953
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I2895d29415bb191bf2d7fc0a4468f085085bd4d9
 
-commit a8cc331
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Feb 4 09:44:40 2015 -0800
+commit 530e7f0
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Thu Jul 14 18:12:16 2016 +0100
 
-    Update the release notes.
+    IPv6: Fix jumbo payload length offset
     
-    Change-Id: Id4fc195e54dba19f697d20d2085f2e1f922c8ced
-    Reviewed-on: https://code.wireshark.org/review/6954
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I52fb082782674cc851b246d3b6afa7b4f14bbe34
+    Reviewed-on: https://code.wireshark.org/review/16434
+    Reviewed-by: João Valverde <j@v6e.pt>
 
-commit febc842
-Author: Evan Huus <eapache@gmail.com>
-Date:   Wed Feb 4 10:02:41 2015 -0500
+commit 43f7d22
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Thu Jul 14 17:55:31 2016 +0100
 
-    Update README.wmem, release notes for emem removal
+    IPv6: Fix Jumbogram hop-by-hop expert info
     
-    Change-Id: Iac5066ff97d26de1660c38b9cd3f17781a521823
-    Reviewed-on: https://code.wireshark.org/review/6949
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: I751acad2fad501b700c01a37bafa96d2add8fb36
+    Reviewed-on: https://code.wireshark.org/review/16433
+    Reviewed-by: João Valverde <j@v6e.pt>
 
-commit 150dd22
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Feb 4 15:55:05 2015 +0100
+commit 75b0e29
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Thu Jul 14 10:08:26 2016 -0700
 
-    [INAP] Make INAP a new style dissector and add an OID dissector for
-    0.4.0.1.1.1.0.0 cs1-ssp-to-scp.
+    Update URLs.
     
-    Change-Id: Ib7261ef199d7a3aedaed14e7f869af8b64c21c92
-    Reviewed-on: https://code.wireshark.org/review/6948
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (Gotta ensure that there's always at least one commit here that's less
+    than a year old. :-))
+    
+    Change-Id: I297920f1b68dd49550ce07544797a9f2cb854cf5
+    Reviewed-on: https://code.wireshark.org/review/16432
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit d9e82b7
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Feb 4 14:04:27 2015 +0100
+commit 6c0972b
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Thu Jul 14 15:07:59 2016 +0200
 
-    [INAP] Add dissection of Cause
-    Ping-Bug:10910
-    Change-Id: I131d81b0d6332cc72e7b32dc81cb7fec4ca3d407
-    Reviewed-on: https://code.wireshark.org/review/6947
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    MBIM: add dissection of AT&T proprietary UUID
+    
+    Based on AT&T Windows 8 Extended API Requirements version 1.8.0
+    
+    Change-Id: Iaf54173812a02023581c530f2340ea21e9e220d9
+    Reviewed-on: https://code.wireshark.org/review/16431
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 0a6d1f9
-Author: gal <graeme.lunt@smhs.co.uk>
-Date:   Tue Feb 3 15:55:05 2015 +0000
+commit d5e435e
+Author: Daniele Lacamera <daniele.lacamera@technicolor.com>
+Date:   Thu Jul 14 14:08:56 2016 +0200
 
-    Support for P3 over RTSE.
+    DHCP: correctly parse PXE options (209-210)
+    
+    option 209 was marked as opaque, now it's  as PXELINUX config file (text)
+    --> Fix: decorate as non-null terminated string
+    --> CfR: IETF RFC5071 section 4.2. "Packet Format"
     
-    Resolve mixed space/tab issue in the RTSE and BER dissectors and included modelines in both templates.
+    option 210 was marked as special, and erroneously decorated as Authentication
+    (option 90)
+    --> Fix: decorate as non-null terminated string
+    --> CfR: IETF RFC5071 section 5.2. "Packet Format"
     
-    Change-Id: I4b75bad94ed111d0faee205e026b2322b7dafbd1
-    Reviewed-on: https://code.wireshark.org/review/6932
+    Bug: 12618
+    Change-Id: I4220c137ef4b8b7f0827496c165b0ca35b70f675
+    Reviewed-on: https://code.wireshark.org/review/16430
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 9875181
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Feb 4 13:24:57 2015 +0100
+commit 644c009
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Thu Jul 14 14:33:01 2016 +0200
 
-    [CAMEL] Dissect additionalCallingPartyNumber.
-    Ping-Bug: 10914
-    Change-Id: I28eb9d7b5192a02f82fe604d20e57aedd706f528
-    Reviewed-on: https://code.wireshark.org/review/6946
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    ETAG: add explicit casts to please OSX buildbot
+    
+    Change-Id: I057ffc6eb5e6c16e05b0ddc1c069159980678b85
+    Reviewed-on: https://code.wireshark.org/review/16429
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 94011c1
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Feb 4 09:52:54 2015 +0100
+commit 4eecdff
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Thu Jul 14 07:46:13 2016 -0400
+
+    packet-beep.c: Pacify OS X buildbot with cast
+    
+    Change-Id: I0149546cdd2aac8335dcb1046d31ed857ed674f3
+    Reviewed-on: https://code.wireshark.org/review/16428
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit 81beae9
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Wed Jul 13 19:48:22 2016 -0400
 
-    [QNET6] Try to fix solaris buildboot.
-    /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1502: warning: 'hf_index' may be used uninitialized in this function
-    /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1502: note: 'hf_index' was declared here
-    /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1502: warning: 'hf_index_off' may be used uninitialized in this function
-    /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1502: note: 'hf_index_off' was declared here
-    /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1500: warning: 'sstree' may be used uninitialized in this function
-    /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1500: note: 'sstree' was declared here
-    /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1502: warning: 'hf_index_len' may be used uninitialized in this function
-    /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1502: note: 'hf_index_len' was declared here
+    proto.c: Unsigned fields should use %u within printf.
     
-    Remove not needed includes.
+    Found by VS Code Analysis
     
-    Change-Id: Iac91954b3d6c8f9799c6fe816af93376419d1b21
-    Reviewed-on: https://code.wireshark.org/review/6945
+    Change-Id: I76ea860cd86b41ef33c47dcc8f6b1c122f8bb668
+    Reviewed-on: https://code.wireshark.org/review/16424
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 9f78bf6
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Feb 3 23:39:05 2015 -0800
+commit 1565910
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Thu Jul 14 10:59:48 2016 +0200
 
-    Use QNX_PC_ for QNX's pathconf parameter values.
-    
-    The numerical values are platform-specific, so call them QNX_PC_; that
-    also avoids collision with the values on the platform on which we're
-    building Wireshark (such a collision broke the Solaris build).
+    MBIM: add a missing break
     
-    Change-Id: I04291eccb818a290eb44eadb17a56ed684285a70
-    Reviewed-on: https://code.wireshark.org/review/6944
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I3a4483861b1d97ff5e43041b3ecca64c3077b284
+    Reviewed-on: https://code.wireshark.org/review/16427
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit f2cb59a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Jun 17 17:03:11 2014 +0200
+commit 67457e9
+Author: William Tu <u9012063@gmail.com>
+Date:   Tue Jul 12 11:09:31 2016 -0700
 
-    Add QNX' QNET protocol
+    Add ERSPAN II support for field EN and Index.
     
-    no ethertype 0x8203-0x8205 support in trunk.
-    0x8204 is QNX OS VER 6's qnet ethernet protocol number.
+    Current ERSPAN II dissector does not support parsing EN field and Index.
+    The patch follows the field description in draft:
+    https://tools.ietf.org/html/draft-foschiano-erspan-01
     
-    Bug:3934
-    Change-Id: I52555b568c3a304f1512fe25f949330b46f49a93
-    Reviewed-on: https://code.wireshark.org/review/6363
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I92ce56264be0fb2560c4d1a5da35738cf45a8c96
+    Reviewed-on: https://code.wireshark.org/review/16400
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 0f353c9
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Jan 8 17:35:58 2015 +0100
+commit 18e4e3c
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Jul 12 13:18:05 2016 -0400
 
-    HTTP2: Add tap for HTTP2 dissector
+    packet-beep.c: Use strtol over scanf to prevent analysis warnings.
     
-    Change-Id: Ib13d9391b64dad19321a4399c95b95d7fb791284
-    Reviewed-on: https://code.wireshark.org/review/6421
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: I9244edc537d2eb49d73e097a4cb34bf2cde868e4
+    Reviewed-on: https://code.wireshark.org/review/16395
     Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit ef929ad
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Tue Feb 3 18:02:29 2015 -0500
+commit efc6e50
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Wed Jul 13 23:50:31 2016 +0200
 
-    TOS-specific forwarding blocks aren't actually required: don't warn when they
-    aren't present.  Only warn if no forwarding blocks are present.
-    
-    Simplify the code a bit while also removing a proto_tree_add_text().  (There
-    are a number of similar proto_tree_add_texts()s here.)
-    
-    Hang the "no forwarding blocks" expert info off the LSA item rather than off
-    the Metric.  The warning is about how much data is in the LSA--it has
-    nothing to do with the Metric.
+    LTE RRC: add dissection of schedulingInfoSIB1-r13 field
     
-    Ping-Bug: 6302
-    Change-Id: I1903ba5ad78101ec4fa2602a1f21e8192f1d8d53
-    Reviewed-on: https://code.wireshark.org/review/6943
-    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Change-Id: I226ae82a2d75a9b658a0e9122b4ef1925b003279
+    Reviewed-on: https://code.wireshark.org/review/16417
+    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: Anders Broman <a.broman58@gmail.com>
 
-commit 8efe6b7
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Jan 28 17:59:48 2015 +0100
+commit 0d73ae3
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Jul 13 14:51:56 2016 -0700
 
-    RADIUS: Sync with FreeRADIUS Master
+    Qt: Allocate packet list records using wmem.
     
-    commit 852f15c72d41c637865776d5b80097e8ffbbb444
-    Author: Alan T. DeKok <aland@freeradius.org>
-    Date:   Mon Jan 26 13:08:21 2015 -0500
+    Add PacketListRecord::operator new, which uses wmem_alloc. Roughly
+    matches the GTK+ UI behavior. Add ColumnTextList which also uses
+    wmem_alloc.
     
-        As found on the net
+    Lazily allocate our column text.
     
-    commit 53bf263d6ca9010acdc004bada894b1bfe0ed676
-    Author: Tobias Hachmer <tobias@hachmer.de>
-    Date:   Mon Jan 26 13:45:04 2015 +0100
+    Change-Id: I86a63cd8ace7764eaab1561bf71b4358af72fe03
+    Reviewed-on: https://code.wireshark.org/review/16418
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit ed27ad4
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Wed Jul 13 18:18:03 2016 -0400
+
+    androiddump.c: Use preprocessor directive to distinguish E_AGAIN and E_WOULDBLOCK.
     
-        add perle dictionary
+    VS Code analysis considers them hardcoded values so the if statement is either
+    always true or always false.
     
-    Change-Id: I15dd8705277f3a0cedd2ea12a7cac9974dadf3c0
-    Reviewed-on: https://code.wireshark.org/review/6835
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: Iad04add9391c515873e2e00d2c6cbd682fbf5b3f
+    Reviewed-on: https://code.wireshark.org/review/16419
+    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit bee4fb0
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Feb 3 09:14:45 2015 +0100
+commit 2c0d117
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Jul 13 20:13:22 2016 -0700
 
-    CAPWAP: Use proto_tree_add_bitmask(_with_flags)
+    Fix VHT valid checks.
     
-    Change-Id: I39ff2e15b91981111f8de091e6e5dfb7586b4599
-    Reviewed-on: https://code.wireshark.org/review/6937
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    The valid array in a struct mcs_vht_valid is indexed by the bandwidth
+    and the NSS-1; use the NSS-1, not the NSS, as the index.
+    
+    The maximum possible value of the NSS is MAX_VHT_NSS, so allow a value
+    of MAX_VHT_NSS.
+    
+    Change-Id: I49585f217f3e70356c1dd1ba32b6c714ce202236
+    Reviewed-on: https://code.wireshark.org/review/16426
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 7ced085
+commit 335b2c0
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Feb 3 17:15:23 2015 -0500
+Date:   Wed Jul 13 19:42:15 2016 -0400
 
-    emem is dead! Long live wmem!
+    vwr.c Dynamically allocate large buffers
     
-    Change-Id: Iddd1200e62bf3200cb1a68408378dd9d47120b77
-    Reviewed-on: https://code.wireshark.org/review/6939
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    VS Code Analysis claims the arrays are too large and should be moved to help
+    
+    Change-Id: I741ebe8cc73a108cb6e6d9ecbda37e2a4b6e1b4b
+    Reviewed-on: https://code.wireshark.org/review/16423
     Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 90a76e0
+commit fb07249
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Feb 3 23:27:01 2015 -0500
+Date:   Wed Jul 13 19:26:16 2016 -0400
 
-    Convert val_to_str -> val_to_str_wmem.
-    
-    This is mostly for GUI usage, but a few dissectors needed some "non-packet scope" conversions.
+    pcapng.c: Use preprocessor directive to compare G_BYTE_ORDER with G_LITTLE_ENDIAN.
     
-    val_to_str officially now uses wmem_packet_scope()
+    VS Code analysis considers them hardcoded values so the if statement is either
+    always true or always false.
     
-    Change-Id: Ic9413eeb3406d7a7683222b86709f3675d628d81
-    Reviewed-on: https://code.wireshark.org/review/6933
+    Change-Id: Iabb8462b66f728195bf378ae26c79a783feddb03
+    Reviewed-on: https://code.wireshark.org/review/16422
     Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 74547db
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Feb 3 08:45:41 2015 +0100
+commit 90e97df
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Wed Jul 13 18:42:14 2016 -0400
 
-    MySQL: Add Server ext caps and Auth Plugin Length to Server Greeting
+    packet-ieee80211-radio.c: Prevent array overflow.
+    
+    Found by VS Code Analysis.
     
-    Ping-Bug: 10346
-    Change-Id: I1b2bd3e9b1dc01118c48c6e159c9a06d4daa061b
-    Reviewed-on: https://code.wireshark.org/review/6936
+    Change-Id: Idab6cb5496749ebff47466b20a9a665b1574565d
+    Reviewed-on: https://code.wireshark.org/review/16421
     Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit c256bbe
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Feb 3 08:32:13 2015 +0100
+commit b20fa86
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Wed Jul 13 18:23:03 2016 -0400
 
-    MySQL: Use proto_tree_add_bitmask(with_flags)
+    packet-gsm_a_common.c: Create typedef declaration for elem_func signature.
     
-    Merge also mysql_dissect_caps_client and mysql_dissect_caps_server
-    and rename mysql_dissect_extcaps_client to mysql_dissect_extacps (it will be reused soon)
+    This should keep VS Code Analysis happy.
     
-    Ping-Bug: 10346
-    Change-Id: I6543363a337d7bbfddba6dd699697a257a2cbb49
-    Reviewed-on: https://code.wireshark.org/review/6935
+    Change-Id: I99ebdc644ba353d5986d6509da784eeaa37dcc8f
+    Reviewed-on: https://code.wireshark.org/review/16420
     Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 18bc353
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Feb 2 09:46:36 2015 +0100
+commit b849d3c
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Tue Dec 29 19:30:58 2015 +0000
+
+    IPv6: Add support for more option types
+    
+    Change-Id: I1027e6e2481774953216ade6da4785e1a3c5ca63
+    Reviewed-on: https://code.wireshark.org/review/16357
+    Petri-Dish: João Valverde <j@v6e.pt>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: João Valverde <j@v6e.pt>
 
-    MySQL: Add support of AuthSwitchRequest/AuthSwitchResponse
+commit 76c0325
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Tue Dec 29 12:15:44 2015 +0000
+
+    IPv6: Refactor dissect_opts() into type-specific dissectors
     
-    Bug: 10351
+    Change-Id: Ife8a7da3bd9bfea347321413bf05ea454186bc6d
+    Reviewed-on: https://code.wireshark.org/review/16356
+    Petri-Dish: João Valverde <j@v6e.pt>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: João Valverde <j@v6e.pt>
+
+commit b7cdff0
+Author: dsrsupport <eugene.exarevsky@dsr-company.com>
+Date:   Wed Jul 13 14:33:55 2016 +0300
+
+    ZigBee: fix column description for APS ACK to T2 packet
     
-    Ping-Bug: 10346
+    If this is APS ACK, do not overwrite its column description by Test Profile command description.
     
-    Change-Id: I730080a0aef293c3c8119f6c762ee246227bd07a
-    Reviewed-on: https://code.wireshark.org/review/6915
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Daniël van Eeden <wireshark@myname.nl>
+    Change-Id: Ibd4ae978776ad9e9924e6933ede90bc2ad8855de
+    Reviewed-on: https://code.wireshark.org/review/16414
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 66fc81b
-Author: cbontje <cbontje@gmail.com>
-Date:   Mon Feb 2 10:09:58 2015 -0700
+commit 998ab7f
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Jul 13 11:06:52 2016 -0700
 
-    SEL Protocol Maintenance (1/2)
+    Speed up col_append_ports on Windows.
     
-    - Clean up naming conventions & variables
-    - 'SEL Protocol' is the entire protocol suite
-    - 'Fast SER' is a function code of 'Fast Message' sub-type
+    Fill in our port information using StringCchPrintf on Windows instead
+    of g_snprintf. Loading a large-ish test capture here under the VS 2013
+    profiler showed that we spent 620 samples in col_append_ports. Switching
+    from g_snprintf to StringCchPrintf reduced that to six samples.
     
-    'selfm' will remain the protocol name in Wireshark so no major architecture naming changes are anticipated
+    Inline col_snprint_port while we're here.
     
-    Change-Id: Idc5117dcede0b61c61c0c64d5cd20199535ed471
-    Reviewed-on: https://code.wireshark.org/review/6919
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I955e5baa66ebb9cc950fc0eb1682d3c015c7a55a
+    Reviewed-on: https://code.wireshark.org/review/16416
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 9e1ddb5
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Tue Feb 3 21:12:07 2015 -0500
+commit 1bd438b
+Author: Kim Kempf <kim.kempf@apcon.com>
+Date:   Tue Jul 12 10:28:38 2016 -0700
 
-    Only set HAVE_LUA if we, er, have Lua.
+    Adding 802.1BR E-Tag dissector
     
-    Change-Id: Idb6f1dfa06c2b4e5d9e1f77743f13b4e0a6d8afe
-    Reviewed-on: https://code.wireshark.org/review/6942
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Based on IEEE Std 802.1BR-2012
+    
+    Bug: 12613
+    Change-Id: Ic5198471f67a1af728df40a09443a1cab2621169
+    Reviewed-on: https://code.wireshark.org/review/16402
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 89e6f4c
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Feb 3 08:39:14 2015 -0800
+commit 6223327
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Jul 12 22:53:39 2016 -0400
 
-    Qt: Add the Protocol Hierarchy statistics dialog.
+    Support Juniper VN over UDP.
     
-    Change-Id: I6872e323daca4798c638d764873f54c4c0dc0006
-    Reviewed-on: https://code.wireshark.org/review/6934
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I40dab9d392ddea1f895b88f8f19c1194e56563a2
+    Reviewed-on: https://code.wireshark.org/review/16408
+    Reviewed-by: Amitoj Setia <amitoj_setia@yahoo.com>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 342ba90
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Feb 3 17:13:49 2015 -0800
+commit 0b00097
+Author: dsrsupport <eugene.exarevsky@dsr-company.com>
+Date:   Wed Jul 13 12:40:54 2016 +0300
 
-    Minor WSDG updates.
+    ZigBee MAC parse: fix Association request parse in case of FCS absence.
     
-    Change-Id: I847af9ef7f18b271a5a2dc8da6c5817735a8c856
-    Reviewed-on: https://code.wireshark.org/review/6941
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    If it is ok to parse packets with bas FSC, FCS may be even absent. Parse MAC command even if remaining buffer length is less that FCS size in such case.
+    
+    Change-Id: Ibbc9fed7ab87d0511f8c97db8e0e3bdf562cd15c
+    Reviewed-on: https://code.wireshark.org/review/16412
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 4fe8ca0
+commit 3ecbe50
 Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Fri Jan 23 07:36:50 2015 -0500
+Date:   Wed Jul 13 10:07:16 2016 -0400
 
-    Simplify how we find Lua and expand the places we look.
+    Restore setting data.edt in write_specified_fields().
     
-    First, it appears some packagers actually ship a pkg-config file for Lua.
-    Try to use it.  (Unfortunately the package name varies so we have to try
-    several package names.)
+    This prevents tshark from crashing when run with "-T fields -e data".
     
-    If that fails, try to find Lua directly, accounting for the various naming
-    conventions we've seen.
+    I5778b08c52119b5be1ec482be9417b3c4ba8ed62 mistakenly removed this line (this
+    'data' is a write_field_data_t rather than the print_data structure that
+    change was cleaning up).
     
-    Bug: 10475
-    Bug: 10572
-    Change-Id: I82e789c466a488dc12431cdd90c49b4c1052414a
-    Reviewed-on: https://code.wireshark.org/review/6756
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Bug: 12616
+    Change-Id: I773e47f12f852e19a20ec29a43eb3a0953923173
+    Reviewed-on: https://code.wireshark.org/review/16415
+    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
 
-commit 0e74e8b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Feb 3 16:25:01 2015 -0800
+commit abd287f
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Wed Jul 13 12:22:37 2016 +0200
 
-    Decorate declarations with G_GNUC_PRINTF() as appropriate.
+    MBIM: add dissection of Intel proprietary UUIDs
     
-    Decorate val_to_qstring() and val_ext_to_qstring() similarly to
-    val_to_str_wmem(); this squelches some compiler warnings.
+    Based on http://www.telit.com/fileadmin/user_upload/products/Downloads/4G/Telit_xN930_MBIM_Command_Functional_Specification_r2.pdf
     
-    Change-Id: I86e102e7c0a1a135be9492b7d605001c5d922031
-    Reviewed-on: https://code.wireshark.org/review/6940
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    While we are at it, add placeholder for AT&T proprietary UUID (no dissection of the buffers).
+    
+    Change-Id: I4f9825d1f9fde474853f9b86a4302742c078d8cd
+    Reviewed-on: https://code.wireshark.org/review/16413
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit deabe64
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Feb 3 16:02:52 2015 -0800
+commit 5e9e48b
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Jul 13 09:28:15 2016 +0200
 
-    Don't build app_bundle by default.
-    
-    As it turns out, building the app bundle makes wireshark-gtk unusable.
+    TCP: fix indent (use 4 spaces)
     
-    Change-Id: Ic3608f0a485c3ec4ea21fbc2e7194553eda8c806
-    Reviewed-on: https://code.wireshark.org/review/6938
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Id08427246f5b481c004e861719b9b213796438c1
+    Reviewed-on: https://code.wireshark.org/review/16409
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
 
-commit b8f040c
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Feb 2 10:37:17 2015 +0100
+commit 3124cf8
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Mon Jun 13 04:56:57 2016 +0100
 
-    Dumpcap: avoid collecting stats on nf* interfaces.
+    IPv6: Simplify RPL routing header dissector
     
-    On Linux nf* interfaces don't collect stats properly and don't allows multiple connections.
+    Use a wmem_array to perform strict checking.
     
-    Change-Id: I69d8f343017d77bda313de7d2c501fab542f2e9b
-    Bug: 10886
-    Reviewed-on: https://code.wireshark.org/review/6796
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Fold cmprI/cmprE dissection into a single loop.
+    
+    Change-Id: I67443a604b47cd9cbca32c7f7276a7e2229580f1
+    Reviewed-on: https://code.wireshark.org/review/16348
+    Petri-Dish: João Valverde <j@v6e.pt>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: João Valverde <j@v6e.pt>
 
-commit 9b22a2f
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Jan 8 09:44:15 2015 +0100
+commit e46be62
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Tue Jul 12 19:04:12 2016 +0200
+
+    LTE RRC: upgrade dissector to v13.2.0
+    
+    Change-Id: If2e15f429e3e35b3deef8afc23e57c8ef3974a22
+    Reviewed-on: https://code.wireshark.org/review/16410
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-    Updates in it translation.
+commit 33fa58c
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Wed Jul 13 10:19:43 2016 +0200
+
+    RLC LTE: fix a typo
     
-    This fixes also the "duplicate messages" error.
+    Change-Id: I6d429da6e36e9609c1b7a539cf75e0c2c484bf00
+    Reviewed-on: https://code.wireshark.org/review/16411
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+
+commit fbb47de
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Jul 12 13:28:10 2016 -0400
+
+    packet-cql.c: Bugfix bitwise operation with parenthesis.
     
-    Change-Id: Iec93d82d4776c4f9805c5bfa2b2453c22b0e24e8
-    Reviewed-on: https://code.wireshark.org/review/6929
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
+    Change-Id: I93e1c64597f309db5341c6ccadfdb3b23c056182
+    Reviewed-on: https://code.wireshark.org/review/16397
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 33bdb21c
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Feb 3 11:58:28 2015 -0500
+commit 0600865
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Jul 12 12:31:33 2016 -0400
 
-    xtp: Don't call col_...() under 'if (tree)'
+    file-pcapng.c:  Apply parenthesis to fix build warnings
     
-    Change-Id: Ie80476e919b5ba0a2e5f036c654a5379b91ddd32
-    Reviewed-on: https://code.wireshark.org/review/6931
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: I35d180e7aa040c94ca80a49e7d2132dd76e46aaf
+    Reviewed-on: https://code.wireshark.org/review/16393
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit a2eec54
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Feb 3 08:56:42 2015 -0800
+commit 8682f4b
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Jul 12 12:32:06 2016 -0400
 
-    BT ATT: Fix what appears to be a value string mismatch.
+    packet-6lowpan.c: fix uninitialized variable (ipv6_ext) warning
     
-    Change-Id: I440ed41c659bed9dcee43d8388ad780015971611
-    Reviewed-on: https://code.wireshark.org/review/6930
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I8182bc9452cbd1201c81407041b6b522434f5ec0
+    Reviewed-on: https://code.wireshark.org/review/16394
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit b635997
+commit 2f3b25c
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Feb 2 19:58:29 2015 -0500
+Date:   Tue Jul 12 13:23:29 2016 -0400
 
-    Convert val_to_str_ext -> val_to_str_ext_wmem for calls that don't have valid packet scope (GUI).
-    val_to_str_ext now officially uses wmem_packet_scope().
+    packet-btrfcomm.c: Add NULL check to pacify VS Code Analysis
     
-    Removed const from val_to_str[_ext]_wmem return value since it's not really constant.
+    Some if checks are confusing the analysis, but it does add some
+    future-proofing.
     
-    Created utility functions in qt_ui_utils.h to help with the new memory management for its GUI.
-    
-    Change-Id: Idf2ce4a4ce78d628b2269ad23a3a48fbfc9c077c
-    Reviewed-on: https://code.wireshark.org/review/6926
+    Change-Id: Ic4fe16a87646a7055f7639af050d53ff004eda5f
+    Reviewed-on: https://code.wireshark.org/review/16396
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit e942973
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Wed Jan 28 17:14:48 2015 +0100
+commit e063924
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Jul 12 08:21:35 2016 -0400
 
-    Bluetooth/USB HID: Move boot form of reports from bthid to usbhid
+    Remove T.30 FCF mask.
     
-    Then call it as new dissectors from bthid and btatt.
-    In future they will be used in usbhid, because they are part of HID.
+    Found by VS Code Analysis, verified with spec that mask isn't needed.
+    Also included link to current spec.
     
-    Change-Id: I9cb545f3079c27945b17bf8791ba4e3736c29e7c
-    Reviewed-on: https://code.wireshark.org/review/6912
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Bug: 1918
+    Change-Id: Ic3e8ee599501c7c12717649579ffd70581622178
+    Reviewed-on: https://code.wireshark.org/review/16392
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 8417fbf
+commit fea50cc
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Feb 2 23:51:36 2015 -0800
+Date:   Tue Jul 12 11:25:49 2016 -0700
 
-    Initialize the entire UUID.
+    Handle dissectors that don't have names.
     
-    Squelches a compiler warning.
+    Dissector handles created with create_dissector_handle() don't have a
+    name; report them as "(anonymous)" (there's no guarantee that the printf
+    family of routines don't crash when a null pointer is provided to %s -
+    the printf routines in at least some versions of Solaris *do* crash in
+    that case).
     
-    Change-Id: I050710dd296f7fe7d315f881b0edf43699d2fa91
-    Reviewed-on: https://code.wireshark.org/review/6928
+    Change-Id: I561ff855a46eeb442299011d567f20751c5c6869
+    Reviewed-on: https://code.wireshark.org/review/16399
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit ca3fe28
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Wed Jan 7 12:16:15 2015 +0100
+commit 719c018
+Author: Thomas PORTASSAU <thomas.portassau@hotmail.fr>
+Date:   Tue Jul 12 08:36:25 2016 +0200
 
-    Bluetooth: ATT: Dissect almost all attributes
+    USB CCID added Interrupt IN and PC2RDR_params
     
-    Change-Id: Ia388c07150d9664327daf2d1990b4465b5f4ae28
-    Reviewed-on: https://code.wireshark.org/review/6910
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: I77a88b910fa51e09f9d5bdb541170de76ffb3708
+    Reviewed-on: https://code.wireshark.org/review/16386
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 60b9be9
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Tue Jan 6 18:42:38 2015 +0100
+commit 45679d2
+Author: dsrsupport <eugene.exarevsky@dsr-company.com>
+Date:   Tue Jul 12 12:21:23 2016 +0300
 
-    Bluetooth: ATT: Dissect Read Multiple Response
+    ZigBee Test Profile #2 enchancement.
     
-    Change-Id: Ifcbde05389901bd66355e42540f3850bfd55def5
-    Reviewed-on: https://code.wireshark.org/review/6909
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    If profile id is ZigBee Test Profile #2, do not try to parse packet contents as other protocol above APS: ZCL or whatever else.
+    
+    Change-Id: I0f1446aea9b270c226c7c472fe794e29240defc9
+    Reviewed-on: https://code.wireshark.org/review/16387
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit db068ff
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Tue Jan 6 14:06:18 2015 +0100
+commit 479caf1
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Jul 11 15:40:03 2016 -0700
 
-    Bluetooth: ATT: Decode some HOGP attributes
+    Add resource usage logging.
     
-    Change-Id: I169f767b699a2f95e5a1553f1380f0b88cd7c67d
-    Reviewed-on: https://code.wireshark.org/review/6908
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Add log_resource_usage, which prints the current and elapsed user and
+    system times. Add a usage example in packet_list_model.cpp.
+    
+    Change-Id: I747161c754a3731e540821715cc9bb10b3dc821d
+    Reviewed-on: https://code.wireshark.org/review/16383
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 73579dd
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Mon Jan 5 13:36:45 2015 +0100
+commit 3fe92ff
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Jul 12 09:09:57 2016 -0400
 
-    Bluetooth: ATT: Dissection stage 3: Assign UUID to Handle
+    Create stub VXLAN (GPE) protocol for Decode As.
     
-    Add possibility to dissect attributes by UUID assigned to handle.
+    Also remove dissector_add_for_decode_as calls as dissector_add_uint
+    already handles that.
     
-    Change-Id: I0e510bf902492f87e0eaee339d82609c37e12741
-    Reviewed-on: https://code.wireshark.org/review/6905
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: I87202d49765ffb1a2e6c922cb02b692fb16c0693
+    Reviewed-on: https://code.wireshark.org/review/16388
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 8ba3d6f
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Wed Dec 31 10:52:28 2014 +0100
+commit 25ba3db
+Author: D. Ulis <daulis0@gmail.com>
+Date:   Mon Jul 11 21:14:36 2016 -0400
 
-    Bluetooth: ATT: Dissect GATT level
+    HTTP: Add request/response arrows
     
-    ATT dissector is now able to decode GATT level fields.
-    This is results of added request-response tracking/share information.
+    HTTP has multiple related packets, so seeing which are the actual request/response (related to the current selected packet) is helpful.
     
-    Change-Id: I41ac622a38916a7a20f625fa30ac72d7812446c6
-    Reviewed-on: https://code.wireshark.org/review/6904
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: I833f4f620cfe8bfe9b1d7518c4e28fbd41b64e29
+    Reviewed-on: https://code.wireshark.org/review/16385
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 33f1256
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Mon Feb 2 21:28:01 2015 -0500
+commit f4ab3f4
+Author: Jeff Layton <jlayton@redhat.com>
+Date:   Mon Jun 20 15:10:32 2016 -0400
 
-    Fix nameless application in NokiaSolutionsAndNetworks.xml (from
-    I4cd9bd7f7219e4d9ff1bb8a71fab32439a8a9a35).
+    ceph: distingush between client and server by checking for a second entity_addr_t
     
-    (The nameless application was causing known applications to be reported as
-    unknown.)
+    The current ceph dissector assumes that the server will always send its
+    initial connection negotiation first, but that's not necessarily the
+    case, especially with the kernel client which sends its banner as soon
+    as the socket is created.
     
-    Add code to the Diameter dissector to report such problems at startup (similar
-    code exists for other entities).
+    So, we need a better mechanism to determine which end is client and
+    which is the server. The server sends its own address and then the
+    address of the client, but the client only sends its own address. We
+    can determine whether the initial negotiation message is from the client
+    or server by looking at the data after the first entity addr and seeing
+    whether it also looks like an entity addr.
     
-    Tweak the parser debug slightly.
+    This patch takes that approach. It just grabs the address family from
+    the second address and sees whether it's IPv4 or IPv6. If it's not one
+    of those, then it assumes that it's not an entity_addr_t at all and is
+    therefore a request from the client.
     
-    Change-Id: I6b28cda8660e6eb96648c7b3697d7fd85151ac96
-    Reviewed-on: https://code.wireshark.org/review/6927
-    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    We could go farther and try to verify the port and address as well, but
+    that's probably overkill. The address family is at the same offset as
+    the host_type field in the client's Connect request, but it's big endian
+    and the host_type is little endian. As long as we don't end up with
+    host_types that are 0x200 or 0xA00, this scheme should be OK.
+    
+    Change-Id: I161d02da86d978272eff95497c6df66766b02ebc
+    Signed-off-by: Jeff Layton <jlayton@redhat.com>
+    Reviewed-on: https://code.wireshark.org/review/16043
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 00f7bc4
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Feb 2 16:22:31 2015 -0800
+commit 2e879e2
+Author: sjha3 <sjha3@ncsu.edu>
+Date:   Sat Jul 2 15:34:37 2016 -0400
 
-    Qt: Fix IO Graph capture file closing.
-    
-    Make sure our IOGraphs remove their respective tap listeners before the
-    capture file closes, otherwise the graph data ends up getting cleared
-    via reset_tap_listeners.
+    Generic Protocol Extension support for VxLAN
     
-    Bug: 10871
-    Change-Id: I0ef2af2dc84be1921a930df8bb68f63626aa874a
-    Reviewed-on: https://code.wireshark.org/review/6925
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Bug: 12323
+    Change-Id: I53bfedf50ad09cda52320b0e6eb81e92ed73efc8
+    Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-on: https://code.wireshark.org/review/16250
 
-commit 9d7f5c7
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Feb 2 22:28:59 2015 +0100
+commit cfcc6fd
+Author: Jesse Gross <jesse@kernel.org>
+Date:   Fri Jun 24 15:28:55 2016 -0700
 
-    ISIS: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    Geneve: Update list of option classes.
     
-    Change-Id: I58debb32cc7a4aa476961eda342f1cd90884c800
-    Reviewed-on: https://code.wireshark.org/review/6921
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Newer versions of the Geneve protocol draft have defined additional
+    option classes. This updates the list so we can show the class name
+    instead of unknown.
+    
+    Change-Id: I19f2024704abe2bc0692c73be783858d74323c0e
+    Reviewed-on: https://code.wireshark.org/review/16382
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 383caa7
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Feb 2 22:28:25 2015 +0100
+commit 4b67b0b
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Mon Jul 11 15:35:29 2016 +0200
 
-    AMQP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    osx-app: small improvement in packaging script.
     
-    Change-Id: Ie55dd06b6c4d6f77012e8e13079279ded2997907
-    Reviewed-on: https://code.wireshark.org/review/6920
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I484ab1b001f7fd578e734b4e006137f590a750a9
+    Reviewed-on: https://code.wireshark.org/review/16379
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit ec618b5
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Feb 1 20:13:13 2015 +0100
+commit ee28324
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Mon Jul 11 18:59:13 2016 +0200
+
+    Fix up *some* of the coding style inconsistencies
+    
+    - return type of a function definition is always on a seperate line
+    - reformat single line expert items into multiline format
+    - no space between functionname and (
+    - reformat some hf_ elements that looked different from most others
+    - space after , where appropriate
+    - Fix the following warnings and errors from checkhf.pl
+      Unused href entry: epan/dissectors/packet-ieee80211.c: hf_ieee80211_ff_rcsi
+      Unused href entry: epan/dissectors/packet-ieee80211.c: hf_ieee80211_ff_rcsi_aid
+      Error: hf_ieee80211_ff_dsss_ofdm: FT_BOOLEAN with non-null 'convert' field missing TFS in epan/dissectors/packet-ieee80211.c
+      Error: non-null hf_ieee80211_ff_dsss_ofdm 'convert' field missing 'VALS|VALS64|RVALS|TFS|CF_FUNC|FRAMENUM_TYPE|&' in epan/dissectors/packet-ieee80211.c ?
+      Error: hf_ieee80211_operat_mode_field_channel_width is passing the address of a pointer to VALS in epan/dissectors/packet-ieee80211.c
+      Error: hf_ieee80211_operat_mode_field_rxnss is passing the address of a pointer to VALS in epan/dissectors/packet-ieee80211.c
+    
+    Change-Id: Ide51d1871755199721e65c0f62b3f6a62ef1159e
+    Reviewed-on: https://code.wireshark.org/review/16381
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 
-    HTTP2: Fix offset for heuristic
-    
-    With >= draft-14, length is encoded in 3 octets (2 octets before)
+commit 7083839
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sat Jul 9 02:22:03 2016 +0100
+
+    IPv6: refactor dissect_routing6() into type-specific dissectors
     
-    Bug: 10908
-    Change-Id: I061570186206548fafcc39a8df0ba6bafe8576a0
-    Reviewed-on: https://code.wireshark.org/review/6883
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I153c39bb76dc30cecede9dbf5fe4abf234fcd719
+    Reviewed-on: https://code.wireshark.org/review/16347
+    Petri-Dish: João Valverde <j@v6e.pt>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: João Valverde <j@v6e.pt>
 
-commit 71fd34d
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Feb 2 14:32:28 2015 -0800
+commit 0002f25
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Mon Jul 11 10:49:53 2016 +0200
 
-    WSUG: Chocolatey updates.
+    hdcp2: don't throw an exception during heuristic check
     
-    Move PowerShell and Chocolatey to the top of the quick setup since most
-    of the instructions now have a "Chocolatey" example.
-    
-    Use "choco install" instead of "cinst" to match the pages at
-    chocolatey.org/packages.
+    Change-Id: I24895950464e1845c468f9fa9b6e5aa3ab8c75de
+    Reviewed-on: https://code.wireshark.org/review/16378
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
+    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit deaac11
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Mon Jul 11 10:29:26 2016 +0200
+
+    iso7816: check for minimum atr len
     
-    Show how to install Cygwin and Python using Chocolatey.
+    and reject the packet if it is shorter
     
-    MAC = Media Access Control (among other things). Mac = Macintosh.
+    make sure that we don't throw an exception when we read the first byte
+    and haven't yet decided if the packet contains an iso7816 atr
     
-    Change-Id: Ic6aabacdd3a86b4e8ca556cc6f3daa62c3e5986b
-    Reviewed-on: https://code.wireshark.org/review/6924
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I7b4c93cc7c55489467b46241f07a1bb5ddfd927a
+    Reviewed-on: https://code.wireshark.org/review/16377
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 37a2cd0
+commit f2584b2
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Feb 2 22:58:41 2015 +0100
+Date:   Sun Jul 10 19:27:47 2016 +0200
 
-    AMQP: fix declaration of 'index' shadows a global declaration
-    
-    St*** Mac OS X buildbot...
+    BGP: Add support of Vendor Capability 131 (Multisession Cisco)
     
-    Part 2 (Oups...)
+    Issue reported by Garri Djavadyan
     
-    Change-Id: I082d73d4581365d7152aca764e4dfe599ce12c64
-    Reviewed-on: https://code.wireshark.org/review/6923
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I6dd4bd20d82a3f2cb8aa45f740f72d33e33053da
+    Ping-Bug:12604
+    Reviewed-on: https://code.wireshark.org/review/16374
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 0b2c8b0
+commit 3932075
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Feb 2 22:46:08 2015 +0100
+Date:   Sun Jul 10 12:17:04 2016 +0200
 
-    AMQP: fix declaration of 'index' shadows a global declaration
+    BGP: Add (Cisco) for "Vendor" Cisco capability
     
-    St*** Mac OS X buildbot...
+    * Route Refresh Cisco capability (128)
+    * ORF Cisco capability (130)
     
-    Change-Id: I5efff34ce818f52fb6414191c58b5cabb388ba26
-    Reviewed-on: https://code.wireshark.org/review/6922
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Issue reported by Garri Djavadyan
+    
+    Bug: 12605
+    Change-Id: Icb19cd6a75315e5af4772dd7833a5b762bdd7ff4
+    Reviewed-on: https://code.wireshark.org/review/16373
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit c96b3ac
-Author: Petr Gotthard <petr.gotthard@centrum.cz>
-Date:   Sat Jan 31 16:52:51 2015 +0100
+commit b0a32c6
+Author: Binh Trinh <beango@gmail.com>
+Date:   Sun Jul 10 01:57:15 2016 -0400
 
-    AMQP 0-9-1: Fix dissection of field types.
-    
-    This patch resolves review comments I received from the AMQP 0-9-1 community.
-    Some field types were not implemented, other field types (introduced by my
-    earlier patch) were incorrectly parsed.
-    https://groups.google.com/forum/#!topic/rabbitmq-users/PR7P1bgonwo
+    NAS-EPS:  Add preference to bypass a heuristic decode of a ciphered NAS.
     
-    I had to split the dissect_amqp_0_9_field_table() function into two parts
-    and put the field value dissectors in a separate function:
-    dissect_amqp_0_9_field_value().
-    
-    Change-Id: I9aa7d73e426a790830ad260ca6892a7650791e6c
-    Reviewed-on: https://code.wireshark.org/review/6882
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 9f4bf6a
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Feb 2 16:02:59 2015 +0100
-
-    LTE RRC: only display band mapping for the initial supportedBandListEUTRA IE
-    
-    Handling bands > 64 would require to store the mapping in file scope and current code is broken for the Carrier Aggregation band combination list
-    
-    Change-Id: I9f10022a50520ca9bc16a33f2c16361729f1b01b
-    Reviewed-on: https://code.wireshark.org/review/6917
+    Change-Id: Ifedb82bbcb29ab978ffb9ce2f485ac9ff0712fc2
+    Reviewed-on: https://code.wireshark.org/review/16363
     Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit e102c34
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Mon Feb 2 16:11:40 2015 +0000
+commit ed69bf3
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jul 10 10:23:40 2016 -0700
 
-    Minor doc changes for Windows build
+    Remove a compiler warning some platforms give.
     
-    Further removal of older style build environment.
+    Some UN*Xes declare an index() function, that being the name strchr()
+    originally had in V7 UNIX.  This causes warnings from compilers if you
+    have a variable named "index", so rename the variable.
     
-    Change-Id: I499ba50f55620ad627de3dc4316051985d00a7f5
-    Reviewed-on: https://code.wireshark.org/review/6918
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
+    Change-Id: Ibb046005d1ef911ce0739ce70a0a55c13310cdf0
+    Reviewed-on: https://code.wireshark.org/review/16372
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 6db0a35
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Jan 31 08:06:05 2015 -0500
+commit fac8f1f
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Jul 10 18:41:23 2016 +0200
 
-    Create wmem versions of val_to_str and val_to_str_ext
+    pvfs2: clean up dissect_pvfs_distribution()
     
-    These will be used to replace cases where packet-scope isn't valid for val_to_str/val_to_str_ext calls
+    remove unnecessary variable initializers
+    remove an unnecessary if (tree) check
     
-    Change-Id: Ie8a4c423a8608548c837c1ae7edde52c4d728340
-    Reviewed-on: https://code.wireshark.org/review/6880
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I4c5326c11efe4fe38fb606a45ca7674484e9421c
+    Reviewed-on: https://code.wireshark.org/review/16371
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit bdaef53
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Mon Feb 2 13:37:50 2015 +0100
+commit 4b83805
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Jul 10 13:32:33 2016 +0200
 
-    Try to fix builbot OSX 10.5 buildbot false-positive
+    mp2t: use tvb_new_subset_remaining() instead of tvb_new_proxy()
     
-    Change-Id: If62eba937326ac5119bde97d9a827e165825b377
-    Reviewed-on: https://code.wireshark.org/review/6914
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 003e337
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Feb 2 09:57:23 2015 +0100
-
-    Fix some indent typo (after g2bf7878e)
+    the latter is internal to the tvb code and not meant to
+    be called from a dissector
     
-    Change-Id: I44769f127f32ffd8a97b1579f371501f4aa9832a
-    Reviewed-on: https://code.wireshark.org/review/6913
+    Change-Id: Iee5af3d59329aeef8156f0bbbd5c765cac4e314d
+    Reviewed-on: https://code.wireshark.org/review/16364
+    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 6521771
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Sun Jan 18 10:44:04 2015 +0100
-
-    Bluetooth: Simplify to "UnknownDirection" in Info column when direction is unknown
-    
-    Change-Id: Ibad679c0b6c95d65389ce087f65b8f31cf3acd68
-    Reviewed-on: https://code.wireshark.org/review/6903
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 1786cfe
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Mon Jan 19 14:27:29 2015 +0100
+commit de796aa
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Jul 10 08:07:47 2016 -0700
 
-    Bluetooth: Advertising Data: Fix Service Data entry
+    [Automatic update for 2016-07-10]
     
-    Service Data entry is defined as UUID (16, 32 or 128) and
-    rest of payload is specific service data.
+    Update manuf, services enterprise-numbers, translations, and other items.
     
-    Bug: 10859
-    Change-Id: Ibaee075a66a144dfc52ed70614677c73a88d6a2c
-    Reviewed-on: https://code.wireshark.org/review/6902
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: I9d1c7b06a449a3b0dc02dd99f33c4e7634e2d1c0
+    Reviewed-on: https://code.wireshark.org/review/16368
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 578c2be
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Sun Jan 11 11:34:17 2015 +0100
+commit 35255d9
+Author: Bruno Verstuyft <bruno.verstuyft@excentis.com>
+Date:   Wed Jun 29 14:25:34 2016 +0200
 
-    Bluetooth: btle_rf: Use proto_tree_add_bitmask
+    DOCSIS: Added dissector for Downstream Profile Descriptor (DPD)
     
-    Change-Id: I79143cb788a13bd67ce2bd515b2b90d427dbcfcb
-    Reviewed-on: https://code.wireshark.org/review/6901
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: I97e6e07be45a5c4de6c8c467e0c782b35036bd98
+    Reviewed-on: https://code.wireshark.org/review/16202
+    Petri-Dish: João Valverde <j@v6e.pt>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Adrian Simionov <daniel.simionov@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit ef6f6f0
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Thu Jan 22 09:54:30 2015 +0100
+commit aa9f560
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Tue Jul 5 20:15:09 2016 -0400
 
-    Bluetooth: AVCTP: Improve IPID handling
+    Cleanup and extend the regex for matching expert info entries.
     
-    If profile is invalid (IPID=1) then add expert info.
+    Match each entity in the structure explicitly rather than skipping a bunch at
+    the end.  This makes it possible to easily (and clearly) specify where we
+    allow white space.
     
-    Change-Id: Id102e51eefe7e5e6314c3677468cb66573e5a893
-    Reviewed-on: https://code.wireshark.org/review/6900
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit c4f08ec
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Sat Jan 17 15:07:47 2015 +0100
-
-    Bluetooth: HCI Vendor: Fix for "Enable WBS" command
+    Don't capture the event group and severity: we don't use them anyway.
     
-    Codec value for mSBC is 0x02 (not 0x01), also "Codec" field
-    does not appear when Codec state in Disable.
+    Don't put single character matches in []: that makes it hard to read (for
+    me anyway).
     
-    Change-Id: I4f0b27d0dc8659fdc054eaf18b54a42aad60275b
-    Reviewed-on: https://code.wireshark.org/review/6899
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 359ff31
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Mon Dec 29 11:07:22 2014 +0100
-
-    Bluetooth: HCI: Improve detecting of undecoded and unknown commands
+    There's no need for both the "m"(ultiline) and "s"(ingle line) options.  Nor
+    the "o"optimize (make buggy) option.
     
-    Undecoded command - command does exist in specification,
-                        but not fully implemented in Wireshark yet
-    Unknown command - command does not exist in specification or
-                      it is quite new and opcode number is not added yet
-    Unexpected parameter - is now working correctly that means if
-                           there is known command but too many parameters
-                           so user should know about this issue
+    These same changes should/will be applied to the hf regex later.
     
-    Change-Id: If3ee24f617f7e6683049558f7a6d68e346e7c92f
-    Reviewed-on: https://code.wireshark.org/review/6898
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: I3bf307dcd6432eb1a0c2b9aceea201f8403e08c0
+    Reviewed-on: https://code.wireshark.org/review/16313
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 2cae320
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sun Feb 1 13:56:39 2015 -0800
+commit 448c89e
+Author: David Morsberger <dave@morsberger.com>
+Date:   Sun Jul 3 19:36:12 2016 -0400
 
-    CMake: Build a complete application bundle on OS X.
+    Remember query after closing Follow Stream
     
-    Run osx-app.sh by default on OS X. Aside from giving us a fully portable
-    application bundle after building this should let us clear our library
-    path at startup should the need arise. Change the name of the osx-app
-    target to app_bundle.
+    Update main filter after follow stream dialog is closed - Use:
+       previous_filter if new 'Back' button (passed in follow() method)
+       filter_out_filter_ if 'Filter Out This Stream' button (built by appending !current_stream to previous_filter)
+       leave filter alone if window closed using Close button or window close. (current stream)
     
-    Search ../Frameworks before ../lib. Create PkgInfo at configure time
-    instead of compile time. Build our program list as we go.
-    
-    Change-Id: If5511ee921108b1c079cef67026eac9e47211be1
-    Reviewed-on: https://code.wireshark.org/review/6896
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Ic02edeaffdc65ff0f33cac4cb9afb8cde28963c7
+    Reviewed-on: https://code.wireshark.org/review/16277
+    Reviewed-by: Jim Young <jim.young.ws@gmail.com>
+    Petri-Dish: Jim Young <jim.young.ws@gmail.com>
+    Tested-by: Jim Young <jim.young.ws@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 3947091
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Feb 1 12:57:30 2015 -0800
+commit ea0b2e0
+Author: Michal Privoznik <mprivozn@redhat.com>
+Date:   Mon Jul 4 10:36:20 2016 +0200
 
-    Fix a typo.
+    Makefile: Install wireshark.pc too
     
-    Change-Id: I2724340e41572fdaa56ebf75478297090563c522
-    Reviewed-on: https://code.wireshark.org/review/6895
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 17b228b
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Sun Feb 1 12:47:13 2015 -0500
-
-    dlm3: col_...() shouldn't be called under 'if (tree)'
+    In my previous patches (8454f2a20e2 and ea16a84ef51) I've tried
+    to make the pkg-config file more robust. But what I had
+    completely forgot about is that the file was never installed by
+    our Makefile rather than we relied on distribution maintainers to
+    be smart and make the package install the file instead. I've
+    realized this as soon as I've tried to update wireshark in my
+    system.
     
-    Change-Id: I577dbfacf13854c74a430d7abec20faca3f0985b
-    Reviewed-on: https://code.wireshark.org/review/6891
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: Idb60157a51ea1dd0afd6cfac695bfa5760485241
+    Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+    Reviewed-on: https://code.wireshark.org/review/16279
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
+    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 50e8415
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Sun Feb 1 12:32:08 2015 -0500
+commit dec3e2e
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sun Jul 10 15:12:05 2016 +0100
 
-    rip: Fix "Dissector Bug": register 5 missing hfi_... fields
+    randpkt_core: Use g_random_* for randpkt_parse_type().
     
-    [ Bug Introduced in gf8e24c9 ]
+    randpkt_parse_type() can (and most likely will) be called before
+    randpkt_example_init(), therefore g_rand_int_range is called with a NULL
+    GRand argument. This produces non-random output.
     
-    Change-Id: I99207334e33b30bf622bbed366c2222113108230
-    Reviewed-on: https://code.wireshark.org/review/6890
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: Id420edc15a5f9dec427c5f1a1dd9a1f18a225319
+    Reviewed-on: https://code.wireshark.org/review/16367
+    Reviewed-by: João Valverde <j@v6e.pt>
 
-commit 351e7d5
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Feb 1 08:06:45 2015 -0800
+commit 3ea8ccf
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Jul 10 13:51:14 2016 +0200
 
-    [Automatic manuf, services and enterprise-numbers update for 2015-02-01]
+    iso14443: the uid size is a generated item
     
-    Change-Id: Iead3755cfba6c39c5da6398e356515337f2ecdd4
-    Reviewed-on: https://code.wireshark.org/review/6887
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I77952e0099ed8103c8316becafc700866b4c46d8
+    Reviewed-on: https://code.wireshark.org/review/16366
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit 70912c8
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Sun Feb 1 11:07:57 2015 +0000
+commit d68043a
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Jul 10 13:48:27 2016 +0200
 
-    Minor doc update for Wwindows build
+    iso14443: expert info for invalid uid size
     
-    Added comment about VS2013 being the preferred option.
-    Added instructions for Win32.Mak.
-    
-    Change-Id: Ic2cca5123c471d9a806d0f4a387f82ad30ace9f6
-    Reviewed-on: https://code.wireshark.org/review/6886
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
+    Change-Id: I3181375c3a2c8a905e1fd8bb722ac27902735ff0
+    Reviewed-on: https://code.wireshark.org/review/16365
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit ff16cfe
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Sun Feb 1 10:52:22 2015 +0000
+commit 3faf0dd
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Sun Jul 10 00:17:03 2016 +0200
 
-    Added nsis generated files to .gitignore
+    Qt: add assert (CID 1311486).
     
-    Change-Id: Id2f1ff7ca5094a785274c41eca0c1f878a427f90
-    Reviewed-on: https://code.wireshark.org/review/6885
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
+    Change-Id: I62290f1f1c7856ee431705a64fae2022b850234a
+    Reviewed-on: https://code.wireshark.org/review/16361
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit a300227
-Author: Petr Gotthard <petr.gotthard@centrum.cz>
-Date:   Fri Jan 30 16:18:48 2015 +0100
+commit 01b28ca
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jul 7 23:01:06 2016 +0200
 
-    AMQP 0-9-1: Add missing methods connection.block and connection.unblock.
+    randpkt_core: change rand() to g_rand_int (CID 1355360).
     
-    Change-Id: I11b32b876ec0f43b1faa2ab40ab66e7f18d981c2
-    Reviewed-on: https://code.wireshark.org/review/6857
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I48560cbb6007eb16aa545a3e8e6a0e8e3b206930
+    Reviewed-on: https://code.wireshark.org/review/16326
+    Petri-Dish: João Valverde <j@v6e.pt>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit df468f5
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Jan 31 17:02:30 2015 +0100
+commit e3cbea3
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sat Jul 9 15:37:27 2016 +0100
 
-    jsmn: check superior token node value before using it
+    IPv6: Remove obsolete comment
     
-    Other uses are already checked but it looks like those ones were missing
+    WS_INET6_ADDRSTRLEN should be used instead of INET6_ADDRSTRLEN.
     
-    Bug: 10907
-    Change-Id: I35c160657faba4371fedb96ab822bcd4fffa7dd8
-    Reviewed-on: https://code.wireshark.org/review/6881
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: Id937ca72361f4f1b3cad2c18b1067c3fddc527a9
+    Reviewed-on: https://code.wireshark.org/review/16359
+    Reviewed-by: João Valverde <j@v6e.pt>
 
-commit dc6482b
+commit a9d5256
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Jan 31 07:55:10 2015 -0500
+Date:   Sat Jul 9 09:05:12 2016 -0400
 
-    Convert the value string APIs that only currently have packet-scope use to wmem.
+    packet-wsp.c: Fix infinite loop in add_headers
     
-    Change-Id: I36942493ce73b49e7257edea967eddf22f21f58e
-    Reviewed-on: https://code.wireshark.org/review/6879
+    Bug: 12594
+    Change-Id: Id86d1e5f2db12871bc1b345721e79e57192f01e1
+    Reviewed-on: https://code.wireshark.org/review/16355
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 6284040
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Jan 31 02:26:57 2015 +0100
+commit 8e1cc70
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Fri Jul 8 23:25:14 2016 +0200
 
-    README.dissector: fixed p_add_proto_data params
+    Fix detection of NSIS/WiX install path when running a win64 CMake
     
-    frame_data has long been gone. struct _packet_info is the same as
-    packet_info, just use that for brevity.
+    On x86 system:
+    System32\cmd.exe
+    ProgramFiles=C:\Program Files
     
-    Change-Id: Ieb02bf6b642d728a7f80087f5cd750b9691e34e9
-    Reviewed-on: https://code.wireshark.org/review/6865
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit c7717ae
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jan 30 20:13:31 2015 -0800
-
-    Get rid of a trailing blank.
+    On x64 system:
+    System32\cmd.exe
+    ProgramFiles=C:\Program Files
+    ProgramFiles(x86)=C:\Program Files (x86)
+    ProgramW6432=C:\Program Files
+    Syswow64\cmd.exe
+    ProgramFiles=C:\Program Files (x86)
+    ProgramFiles(x86)=C:\Program Files (x86)
+    ProgramW6432=C:\Program Files
     
-    Change-Id: I27e3ba1be4a9ee23d619d751ae1abdef963b7597
-    Reviewed-on: https://code.wireshark.org/review/6871
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I32d52219366b299f1e8099dc6d7737970dc398dd
+    Reviewed-on: https://code.wireshark.org/review/16346
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 4424d6a
+commit 01c6483
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jan 30 20:12:10 2015 -0800
+Date:   Sat Jul 9 00:07:52 2016 -0700
 
-    Fix a comment to reflect reality.
+    Check for pcapng files when reading from a pipe.
     
-    Change-Id: I90fce5376ca17648840c473afac7f9e962c14667
-    Reviewed-on: https://code.wireshark.org/review/6870
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 90233ff
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jan 30 20:06:49 2015 -0800
-
-    We need to get the pathname of the executable *before* running dumpcap.
+    That way, people don't get confused by an "Unrecognized libpcap format"
+    error - it's *not* libpcap format!
     
-    In order to find dumpcap, we need to get the pathname of the executable
-    image, and we support -D in the first argument parsing loop, and that
-    runs dumpcap to get the interface list, so we need to get the pathname
-    of the executable image before that.
+    Also, improve *that* message to say "...or not libpcap data", and put a
+    period at the end of the error messages.
     
-    Change-Id: If789cf1ff4f5cf5d5c3b171a3d4eb90a6e2faf1d
-    Reviewed-on: https://code.wireshark.org/review/6869
+    Change-Id: I175f9399fe99ce424f1d83596b7330e1fa5c0625
+    Reviewed-on: https://code.wireshark.org/review/16349
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit cca2cde
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jan 30 20:03:01 2015 -0800
+commit 94c0f91
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Thu Jun 30 11:09:07 2016 +0100
 
-    No main window *to* update in the early argument list parsing.
+    Fix value_string_ext_free() constness
     
-    We haven't yet popped the main window up, so, when we call
-    capture_interface_list(), we shouldn't pass a pointer to the "update the
-    main window" routine.
+    Don't declare destructor as taking a const argument.
     
-    Change-Id: Id3e02199479e66bb9e9aff99b435bd03af45a1af
-    Reviewed-on: https://code.wireshark.org/review/6868
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I9badfe400718bef41a0e0a00d4b3d1b0bb2879d1
+    Reviewed-on: https://code.wireshark.org/review/16342
+    Reviewed-by: João Valverde <j@v6e.pt>
+    Petri-Dish: João Valverde <j@v6e.pt>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit ee9d0f9
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jan 30 18:12:51 2015 -0800
+commit 4feb116
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Thu Jun 2 17:17:43 2016 +0100
 
-    This being C++, maybe we don't have to initialize ws_app until later.
+    IPv6: Remove a memcpy()
     
-    Try going back to haveing ws_app be an automatic variable, but don't
-    declare it until after we've done the first-pass argument parsing.
+    Replace CamelCase and remove unnecessary casts too.
     
-    Change-Id: Ia1f2a4819570bfadcba75d498e01dbe64991843c
-    Reviewed-on: https://code.wireshark.org/review/6867
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Iacf56912448c0e0dc0fe21477d6b71ba9caba69a
+    Reviewed-on: https://code.wireshark.org/review/16344
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: João Valverde <j@v6e.pt>
 
-commit a984dbf
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jan 30 18:04:26 2015 -0800
+commit 44c2560
+Author: Amitoj Setia <asetia@juniper.net>
+Date:   Fri Jul 8 09:42:50 2016 -0700
 
-    Do the first-pass argument parsing before creating the WiresharkApplication.
-    
-    That way, *all* the don't-need-a-GUI options can be processed without
-    trying to pop up a GUI, just as is the case with the GTK+ version.
+    fixed some juniper vn dissector bugs
     
-    Change-Id: Icbe47642eec45e887087f46c366322b8f23206cc
-    Reviewed-on: https://code.wireshark.org/review/6866
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I67ea5df962266c1476d1d1b6234e831018138422
+    Reviewed-on: https://code.wireshark.org/review/16341
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit e76e140
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Jan 30 23:34:18 2015 +0000
+commit 837b534
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Fri Jul 8 15:58:55 2016 +0200
 
-    Qt: Fix library path reset.
+    GSM RLC/MAC: register dissectors for EC-GSM-IoT control messages
     
-    g9a3676a reset the Qt library path *after* wsApp was instantiated, which
-    is too late. Do so before QCoreApplication has a chance to do anything
-    we might regret.
-    
-    Change-Id: Ibbdb69d1b7c0ea4bf1042e98a5bb5deba13e954e
-    Reviewed-on: https://code.wireshark.org/review/6864
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I8fe84cc98b8967c529c07ff17014648610ad8660
+    Reviewed-on: https://code.wireshark.org/review/16340
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 9a3676a
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Jan 30 11:36:10 2015 -0800
+commit f0bc390
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Fri Jul 8 12:24:13 2016 +0200
 
-    Qt: Clear our library path at startup on Windows.
-    
-    I recently rebuilt my Windows development VM and discovered that I could
-    no longer run Wireshark executables from wireshark.org. Trying to do so
-    failed with the following error:
+    MAC LTE: upgrade dissector to v13.2.0
     
-    ----
-    This application failed to start because it could not find or load the
-    Qt platform plugin "windows".
-    
-    Available platform plugins are: minimal, offscreen, windows, windows.
-    
-    Reinstalling the application may fix this problem.
-    ----
+    Change-Id: Ic859d69583ca3c342d4775511b68fc276f3290a4
+    Reviewed-on: https://code.wireshark.org/review/16339
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+
+commit 80b4302
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Thu Jul 7 09:46:12 2016 +0000
+
+    When generating the LUA reference in AsciiDoc then say so.
     
-    As it turns out there are two issues. According to
-    http://doc.qt.io/qt-5/windows-deployment.html The search path
-    for Qt plugins is hard-coded into the QtCore library. Dependency
-    Walker confirmed this, showing that Qt5Core.dll tried to load
-    C:\Qt\5.3\msvc2013_64_opengl\plugins\platforms\qwindows.dll instead of
-    C:\Program Files\Wireshark\platforms\qwindows.dll.
+    Generating LUA documentation source for the developer guide says that
+    it's generating XML, which it did before the switch to AsciiDoc. Fix
+    this statement.
     
-    The second issue is that the Qt online installer only uses the major
-    and minor version, e.g. C:\Qt\5.3. This means that you can end up with
-    Qt 5.3.0, .1, .2, or .3 depending on *when* you run the installer.
+    Change-Id: Ib8625af84c74b5f6dc31c1e9e5ded80d9d7940ff
+    Reviewed-on: https://code.wireshark.org/review/16320
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit a7b7f94
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Fri Jul 8 08:06:30 2016 +0200
+
+    couchbase: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
     
-    The Windows builders have 5.3.1 installed while my development VM
-    has 5.3.2. Apparently qwindows.dll is not compatible between these two
-    versions, hence the startup error. (...so what happens if you can create
-    a malicious qwindows.dll which *is* compatible on someone's machine?)
+    Change-Id: Ie1e3b071388b3527bba1088af69d76dcb8d6981a
+    Reviewed-on: https://code.wireshark.org/review/16333
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit c3fc1e4
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Thu Jul 7 21:49:41 2016 -0400
+
+    APRS: more cleanup.
     
-    This change removes any entries from QCoreApplication::libraryPaths that
-    don't match our executable path. This shouldn't be an issue in our case
-    because both the NMake+QMake and CMake environments run windeployqt to
-    copy in any required DLLs.
+    There's no need to create global structures with pointers to the (global) hf's
+    to pass into the dissection functions.  Just reference the global variables
+    directly.
     
-    If it *is* an issue or if clearing the library path list causes other
-    problems I can reinstall Qt on the Windows builders into a unique and
-    obvious path, e.g. C:\Qt-check-your-path-before-you-wreck-your-path\5.3
+    Remove other global variables passed as arguments while we're at it.
     
-    Change-Id: I1918bc4e520aba32cfcf9f4ccd37bf9255058cbe
-    Reviewed-on: https://code.wireshark.org/review/6863
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit f61c969
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Jan 30 10:54:12 2015 -0800
-
-    NMake: Add Chocolatey paths.
+    Remove boilerplate comments.
     
-    Change-Id: I8ea53475a64052e945709a1f5878aa23eee65c74
-    Reviewed-on: https://code.wireshark.org/review/6859
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I7ce6b356172aa25983f4cc6a007a0158cb7f26c9
+    Reviewed-on: https://code.wireshark.org/review/16331
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit eda485e
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Fri Jan 30 13:49:59 2015 -0500
+commit 54bf3e9
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Thu Jul 7 21:23:57 2016 -0400
 
-    Cleanup:
+    APRS: clean up some header fields.
     
-    Including:
-      tvb_length...() ==> tvb_reported_length...()
-      Remove some dead initializers;
-      Localize some variables;
-      Whitespace.
+    Try to make the names self-explanatory (without relying on blurbs).
     
-    Change-Id: Ide9490f248d558bb7e3af96a1fc17d8f911de4ef
-    Reviewed-on: https://code.wireshark.org/review/6862
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: Icfb4797282987b42ac68709b431d8b7248a0a633
+    Reviewed-on: https://code.wireshark.org/review/16330
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 7b929e2
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Fri Jan 30 13:48:32 2015 -0500
+commit 07ab40e
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri Jul 8 10:52:29 2016 +0200
 
-    rtp: cleanup
+    Qt: Update scrollbars when change byte view format
     
-    - Remove dead initializers;
-    - Localize some vars;
-    - Whitespace
+    Update scrollbars when changing display format between hex and
+    bits view because the height of the phane will change.
     
-    Change-Id: Ie98667de736f2928ce1a2e4986917e4b0457866f
-    Reviewed-on: https://code.wireshark.org/review/6861
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: I81556c8dbdfb0a34f6c97e76834646a40aed62bb
+    Reviewed-on: https://code.wireshark.org/review/16336
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 1ec66f0
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Fri Jan 30 13:14:36 2015 -0500
+commit 3cf1048
+Author: dsrsupport <eugene.exarevsky@dsr-company.com>
+Date:   Fri Jul 8 11:37:31 2016 +0300
 
-    rtps: Cleanup
+    ZigBee GreenPower: Fix GP Pairing command dissection.
     
-    - Remove dead initializers;
-    - Localize some variables;
-    - Whitespace.
+    Fix length of Sink GroupID in GP Pairing command.
     
-    Change-Id: I876dfd88b2c3fe6a8056090f508c868f4a3cf653
-    Reviewed-on: https://code.wireshark.org/review/6860
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: I5905812456faa0181ee1cc13824a12ce2583d4e0
+    Reviewed-on: https://code.wireshark.org/review/16335
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit cc66f68
-Author: Evan Huus <eapache@gmail.com>
-Date:   Fri Jan 30 12:02:47 2015 -0500
+commit 0b53325
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri Jul 8 09:45:26 2016 +0200
 
-    kafka: fill in some expert info
+    p1: Add BuiltInEncodedInformationTypes.telex
     
-    Change-Id: I94e655fc56fd1534d57f6917d9e5f4189e08838a
-    Reviewed-on: https://code.wireshark.org/review/6858
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    This is for completeness.
+    
+    Change-Id: Id89f649aa836dd011f0967cdbdc905916b4d2182
+    Reviewed-on: https://code.wireshark.org/review/16334
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 5e3936e
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Jan 29 21:20:48 2015 +0100
+commit 330bc0e
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Jul 6 08:46:29 2016 +0200
 
-    BSSGP: ensure that all Optional / Conditional Information Elements are treated as such
+    nbifom: fix no previous prototype for 'proto_register_nbifom' [-Wmissing-prototypes]
     
-    Bug: 10903
-    Change-Id: I8f6b970a6988fd4e700203304586c8e53dd5696b
-    Reviewed-on: https://code.wireshark.org/review/6845
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I4456cfd6600986b2e0c1cecf7d3054f3e829a210
+    Reviewed-on: https://code.wireshark.org/review/16332
     Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 14a869c
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Jan 30 00:02:20 2015 +0100
+commit b080563
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jul 7 22:43:49 2016 +0200
 
-    GSM MAP: display TBCD digits, USSD string and Location Number digits in a subtree
+    Qt: add initializers (CID 1261463).
     
-    Bug: 10900
-    Change-Id: I01277633a1314e68363ef433f3b99b4138657330
-    Reviewed-on: https://code.wireshark.org/review/6850
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I5c2d5c73e188586a91dde342d6347d25495e0263
+    Reviewed-on: https://code.wireshark.org/review/16325
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit a614212
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Jan 29 23:06:37 2015 +0100
+commit 785d229
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jul 7 22:38:40 2016 +0200
 
-    SDP: add ability to display port as a string
+    Qt: add initializer (CID 1269610).
     
-    Bug: 10898
-    Change-Id: Ib1b5698c85cd568b8874b44690cafe391eea28f3
-    Reviewed-on: https://code.wireshark.org/review/6849
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I483e5d3f239f4708f9fc6b11c98869bb1381fb44
+    Reviewed-on: https://code.wireshark.org/review/16324
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 78755c7
-Author: Hadriel Kaplan <hadrielk@yahoo.com>
-Date:   Thu Jan 29 18:55:15 2015 -0500
+commit 03ca5c0
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jul 7 22:35:30 2016 +0200
 
-    Disable SSE4.2 _ws_mempbrk_sse42 only for older Apple compilers
+    Qt: add initializers (CID 1317257).
     
-    This is a longer term fix to disable _ws_mempbrk_sse42 in older
-    Apple compilers, which the buildbots currently use. This fix
-    is the longer-term fix for the temprorary one introduced in
-    g9a366b04/I2e438ff29.
-    
-    Bug: 10798
-    Change-Id: I051ca003610c07f7d75cc19b20ff823fe4c1ce05
-    Reviewed-on: https://code.wireshark.org/review/6851
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    Change-Id: I61a63c187990b119b62e99871832913a0e3f75e4
+    Reviewed-on: https://code.wireshark.org/review/16323
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 2bf7878
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Jan 14 17:25:56 2015 -0800
+commit d83ee1d
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Thu Jul 7 17:21:48 2016 -0700
 
-    Qt: Add the RTP Streams dialog.
+    Handle extcap binaries and the libssh upon which some depend.
     
-    Add keyboard shortcuts. Note that not all of the buttons made it from
-    GTK+.  Add a "Go to setup frame" option.
+    Search the extcap binaries for shared libraries they require.
     
-    Move rtp_streams.c from ui/gtk to ui.
+    Treat libssh specially - for some reason, when built by macosx-setup.sh
+    (which just does a standard cmake build of libssh), libssh's shared
+    library has just libssh.4.dylib, not {installation
+    directory}/libssh.4.dylib, as its shared library ID, so we don't find
+    its binary using otool -L.
     
-    Add a help URL for RTP analysis (which needs to be split into streams +
-    analysis).
+    Bug: 12471
+    Change-Id: I3e5632d7520f1bbeca1a8faae3a012938ef9dee7
+    Reviewed-on: https://code.wireshark.org/review/16329
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit 853df46
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jul 7 22:13:41 2016 +0200
+
+    osx-app.sh: add ciscodump.
     
-    Fix RTP stream packet marking.
+    Ping-Bug: 12471
+    Change-Id: I7326e43ce8b294c8065e09120d85b4743f1659a9
+    Reviewed-on: https://code.wireshark.org/review/16321
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit d80c3b9
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Fri Jul 8 00:24:14 2016 +0200
+
+    Clean up fixed field handling
     
-    Change-Id: Ifb8192ff701a933422509233d76461a46e459f4f
-    Reviewed-on: https://code.wireshark.org/review/6852
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    - Get rid of FF_FIELD macro. Use resoved strings instead.
+    - Reorder add_ff_ functions so we don't need forward declarations
+    - Replace add_fixed_field call by call to resolved function
+    - Remove add_fixed_field and all structs and enums exclusive to it.
+    - #if 0 out unused function add_ff_relay_capable_sta_info
+    
+    Change-Id: I9955febb317f3e7c1b9ae28a5ee9c6a6472f7e9c
+    Reviewed-on: https://code.wireshark.org/review/16328
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 
-commit 6824cee
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Jan 29 12:09:34 2015 +0100
+commit 10db044
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Thu Jul 7 21:33:09 2016 +0100
 
-     CAPWAP: Add support of Cisco Vendor Specific Element
+    CMakeLists.txt: Fix gcee3e82
     
-    Change-Id: I62886bda3220d9aa3a5b3aee8b40063a8bb7745d
-    Reviewed-on: https://code.wireshark.org/review/6843
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Bug: 12589
+    Change-Id: I7f9be4027214cb7ae4f7b235cba73c088596a80d
+    Reviewed-on: https://code.wireshark.org/review/16322
+    Reviewed-by: João Valverde <j@v6e.pt>
 
-commit fd1bc6d
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Jan 29 10:22:17 2015 +0100
+commit 166cede
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Tue Jul 5 22:01:52 2016 -0400
 
-    HCRT: udp port preference changed into range.
+    APRS: register the storm fields.
     
-    Change-Id: I6201bec1c3226181d2e5df8f3bf47471136b0ef5
-    Reviewed-on: https://code.wireshark.org/review/6839
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    There's been a comment here since 2012 about them being unregistered.  Put in
+    some registrations based on a feeble understanding of the specification (these
+    are all strings, add them as such); that should be close enough and is much
+    better than the (dissector) assertion we'd get otherwise.
+    
+    Don't bother putting those hf's in a global structure and passing around the
+    structure: the hf's are global anyway--just reference them directly.
+    
+    Add a link to the specification while we're here.
+    
+    Change-Id: Ia7b17e92a996a1a8eb4a4489eff9fca042190a32
+    Reviewed-on: https://code.wireshark.org/review/16318
+    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit aaa3d23
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Jan 29 13:24:54 2015 +0100
+commit fb74b16
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed May 25 08:06:46 2016 +0200
 
-    When issued with -v wireshark-qt prints version and exits.
+    PAPI: Update Header field
     
-    Change-Id: I3993c502156d534f17baa409729e2dc763910ac8
-    Bug: 10789
-    Reviewed-on: https://code.wireshark.org/review/6840
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I0c2a522ea70e62b6962c99729068e962beb21085
+    Reviewed-on: https://code.wireshark.org/review/15572
     Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 67b069e
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Jan 29 13:55:18 2015 -0800
+commit 0f07378
+Author: Roland Knall <roland.knall@br-automation.com>
+Date:   Wed Jul 6 13:39:54 2016 +0200
 
-    Qt: Add address conversion convenience routines
-    
-    Add address_to_qstring and address_to_display_qstring, which wrap
-    address_to_string and address_to_display respectively and return
-    QStrings. Convert most of the instances in ui/qt to the new routines.
+    openSAFETY: Simplify handling of SN Fail/Ack
     
-    Fix a some memory leaks in the process.
+    Also add information about error group/code acknowledged,
+    and additional parameter set missing, if applicable
     
-    Change-Id: Icda80bbfe0b2df723d54c8da84355255f819af89
-    Reviewed-on: https://code.wireshark.org/review/6848
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I911d9941a33ff4064649090908e0fcc2bf6e00f8
+    Reviewed-on: https://code.wireshark.org/review/16319
+    Petri-Dish: Roland Knall <rknall@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Reviewed-by: Roland Knall <rknall@gmail.com>
 
-commit 2edf8bb
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Jan 29 13:55:00 2015 +0100
+commit 0bc8cf2
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Tue Jul 5 20:14:34 2016 +0100
 
-    SDP: check that media format starts with a digit before trying to identify media type
+    configure: Check for working lrelease
     
-    Bug: 10899
-    Change-Id: I92319a668ae795247d4021f32d629f5000ceb395
-    Reviewed-on: https://code.wireshark.org/review/6841
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 0ba51cc
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Jan 17 16:11:06 2015 +0100
-
-    IS-IS: Add subTLV Bandwidth Constraints (22) used by IS Reachability
+    The qtchooser package in many (all?) distros installs executable symlinks to
+    qtchooser that can mislead AC_PROG_PATH if the corresponding Qt linguist
+    tools package is missing.
     
-    Change-Id: I7e1d29270aede25268bb75a2b5fc9448dbc1cc9b
-    Reviewed-on: https://code.wireshark.org/review/6585
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Bug: 12570
+    Change-Id: I98795a3a7b8a05214c56a0c7b50829ea3b2976fa
+    Reviewed-on: https://code.wireshark.org/review/16316
+    Petri-Dish: João Valverde <j@v6e.pt>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Adrian Simionov <daniel.simionov@gmail.com>
+    Reviewed-by: João Valverde <j@v6e.pt>
 
-commit 9a366b0
-Author: Hadriel Kaplan <hadrielk@yahoo.com>
-Date:   Thu Jan 29 13:06:03 2015 -0500
+commit 5758aa5
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Tue Jul 5 21:22:36 2016 -0400
 
-    Disable SSE4.2 _ws_mempbrk_sse42 due to bug 10798
+    ATM PW: don't use macros to generate hf entries.
     
-    This is a (possibly) temporary change to master to
-    disable _ws_mempbrk_sse42 to see if that fixes bug
-    10798.
+    The macros weren't saving much code, were confusing checkhf.pl, and were hiding
+    useability problems with the fields (such as names equal to the abbreviation
+    and having several fields with the same abbreviation--things checkAPIs.pl can
+    check now that the macros are out of the way).
     
-    Ping-Bug: 10798
-    Change-Id: I2e438ff299f55709c66a37634d2a7e799c513ac9
-    Reviewed-on: https://code.wireshark.org/review/6844
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: Id2ba67d09ce7dd424aee9d7f2e25eb54fa432d98
+    Reviewed-on: https://code.wireshark.org/review/16315
+    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
-    Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
+    Reviewed-by: João Valverde <j@v6e.pt>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 0137f92
-Author: Evan Huus <eapache@gmail.com>
-Date:   Thu Jan 29 10:01:38 2015 -0500
+commit 7f22c8a
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Tue Jul 5 21:40:26 2016 -0400
 
-    addr_resolv: correctly scope returned memory
+    LAT: use ENC_ASCII when adding strings.
     
-    *_port_to_display functions take an allocator scope, so the memory they return
-    must be allocated from that scope, which means we must strdup the result of
-    serv_name_lookup.
-    
-    Bug: 10901
-    Change-Id: I337c8b6f9dfece966964c09023679b3e24648e48
-    Reviewed-on: https://code.wireshark.org/review/6842
+    Change-Id: If3970fbc25d4085037fb975498de02449e2c25c1
+    Reviewed-on: https://code.wireshark.org/review/16317
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
 
-commit 25f1df4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jan 28 13:04:14 2015 -0800
+commit c43984c
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Tue Jul 5 20:46:08 2016 -0400
 
-    "%l[doux]" doesn't mean "64-bit integer".
+    LAT: register several hf's.
     
-    Use G_GINT64_MODIFIER as the format modifier to indicate that the value
-    being printed is 64-bit; there is no guarantee that long is 64-bit (it's
-    not 64-bit on ILP32 platforms such as 32-bit Windows and 32-bit UN*X, or
-    even on LLP64 platforms such as 64-bit Windows).
+    Found by checkhf.pl
     
-    Change-Id: I0444f7f396969824f1040c06a67753718c32881b
-    Reviewed-on: https://code.wireshark.org/review/6838
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: If985d04f24a188ac402bc11cf61d29aa418ad242
+    Reviewed-on: https://code.wireshark.org/review/16314
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 49a7e97
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jan 28 12:56:19 2015 -0800
+commit f5eaf53
+Author: Hendrik Uhlmann <Hendrik.Uhlmann@rheinmetall.com>
+Date:   Tue Jul 5 14:16:48 2016 +0200
 
-    Try dissecting some stuff even if we don't have conversation information.
+    DIS: Introduced support of Collision PDU
     
-    Fill in a local transaction information structure, so we can pass data
-    from the packet down.  Skip stuff that depends on conversation
-    information if we don't have any.
+    Parse all Attributes of Collision PDU and display them in wireshark HMI.
     
-    Change-Id: I5a8bd21bdf632ada9013e616c5fc4e8bd14c9698
-    Reviewed-on: https://code.wireshark.org/review/6837
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I3003c6dd709498cc6c1adf784800047d0984bafa
+    Reviewed-on: https://code.wireshark.org/review/16299
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
 
-commit 9e647a9
-Author: Petr Gotthard <petr.gotthard@centrum.cz>
-Date:   Mon Jan 26 10:40:01 2015 +0100
+commit 4b06222
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Jul 5 16:45:52 2016 +0200
 
-    Extended AMQP 0-9 dissector to support AMQP 0-9-1 methods and datatypes. Backward compatibility to AMQP 0-9 is maintained.
+    Qt: add initializers (CID 1268205).
     
-    Change-Id: Ie39cb40dca3d9f778ef2c04cbef24c968a91ec6c
-    Reviewed-on: https://code.wireshark.org/review/6791
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I7eb71876731df29c076a3a756b6748f165d1c327
+    Reviewed-on: https://code.wireshark.org/review/16306
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Dario Lombardo <lomato@gmail.com>
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 6940a97
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jan 28 11:39:04 2015 -0800
+commit 50d1d59
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Jul 5 23:08:30 2016 +0200
 
-    Go back to installing 5.2.3 for now.
+    Qt: add initializers (CID 1162824).
     
-    Change-Id: I1c798cd1a74aee559225fea1e4bc3694466de861
-    Reviewed-on: https://code.wireshark.org/review/6836
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ib570d3531bfdd35404b75d49dbd7dd43db4c30d9
+    Reviewed-on: https://code.wireshark.org/review/16310
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 83678a0
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Jan 28 10:58:32 2015 +0100
+commit 4b484a6
+Author: Sergey Avseyev <sergey.avseyev@gmail.com>
+Date:   Wed Jul 6 01:22:11 2016 +0300
 
-    Proto dialog (GTK) : fix indent (use 2 spaces) and add modelines
+    packet-couchbase.c: describe observe-seqno (0x91)
     
-    Change-Id: I36945843b8d544188a3ffe89f397e669f3944593
-    Reviewed-on: https://code.wireshark.org/review/6831
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I6018a57a8ae947ee68aa35901398d504d35b99c7
+    Reviewed-on: https://code.wireshark.org/review/16312
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
 
-commit f011af2
-Author: Anders <anders.broman@ericsson.com>
-Date:   Wed Jan 28 13:41:00 2015 +0100
-
-    Add files missing from the tarball.
-    
-    Change-Id: I126f40ac122a7b9236e8718a89d35ad12fc89c04
-    Reviewed-on: https://code.wireshark.org/review/6834
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d7538cb
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Jan 27 18:51:05 2015 +0100
-
-    ANSI IS-637-A: prevent an out of bounds access
-    
-    Bug: 10897
-    Change-Id: I8316ba40ec00b612e4edd490e3cd36e7277912a9
-    Reviewed-on: https://code.wireshark.org/review/6824
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 15c895d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jan 28 01:47:31 2015 -0800
-
-    Make the USB header information an enumerated type.
-    
-    It's not really a bitset, it's a choice of one of four types of USB
-    pseudo-header.  Make it an enum.
-    
-    Change-Id: I4ea994e1606c23e0a0f08b1b61357eea40a2535e
-    Reviewed-on: https://code.wireshark.org/review/6830
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 53a5e4f
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Jan 27 16:59:30 2015 +0100
-
-    win32: fix detection of Windows 10 Technical Preview
-    
-    The version number changed from 6.4 to 10.0
-    
-    Change-Id: Ie749c97e8335f77d414d80edbd69373bd9a1cdad
-    Reviewed-on: https://code.wireshark.org/review/6820
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 946856a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jan 28 01:17:04 2015 -0800
-
-    Move tests out of try_dissect_linux_usb_pseudo_header_ext().
-    
-    Do the tests in its callers; rename it to just
-    dissect_linux_usb_pseudo_header_ext() and don't bother passing it the
-    header_info flag.
-    
-    We can remove some of those tests as they're already done in the caller.
-    
-    Change-Id: I7c3cfefba833a84c834462307088f5c31612128e
-    Reviewed-on: https://code.wireshark.org/review/6829
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit f090ebb
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jan 27 21:23:55 2015 -0800
-
-    Add documentation URLs for the Linux USB and USBPCAP pseudo-headers.
-    
-    Change-Id: If5cecfeb66b3caca6478206f2fcb2f617ef02b46
-    Reviewed-on: https://code.wireshark.org/review/6828
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 3aab6fc
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Jan 27 09:25:29 2015 -0800
-
-    Qt: Update packet list freeze/thaw behavior.
-    
-    Move the clear() calls in gee320ef a bit earlier in the code to
-    PacketList::freeze. No model means no packets.
-    
-    Bug: 10896
-    Change-Id: Ie440e3da4c5fb601048f4e94c8712ecf2d864d4f
-    Reviewed-on: https://code.wireshark.org/review/6823
-    Reviewed-by: Sean Stalley <seanstalley@gmail.com>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 9976422
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Jan 27 14:34:35 2015 +0100
-
-    Added json heuristic to Dropbox LAN sync Discovery Protocol.
-    
-    Change-Id: I0d649ddc0f1539616eca0322ba54a7735338c738
-    Reviewed-on: https://code.wireshark.org/review/6817
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit d3261b2
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Jan 27 12:55:05 2015 -0500
-
-    Comment out various 'if(tree)'
-    
-    col..._() and/or expert...() should not be called under 'if(tree)'
-    
-    Change-Id: I57efe44794977d3f93e4764642b091044a125c0c
-    Reviewed-on: https://code.wireshark.org/review/6826
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit 75858d7
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Jan 27 12:01:43 2015 -0500
-
-    rtps: Remove various 'if(tree)'
-    
-    col_...() and expert_...() should not be called under 'if(tree)'
-    
-    Change-Id: I2f1a8345ff18c0174bcd81b37179aa2d5ee74aca
-    Reviewed-on: https://code.wireshark.org/review/6825
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit 678cf27
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Jan 27 15:14:47 2015 +0100
-
-    NETROM: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
-    
-    Change-Id: Ie534cbd4fb592d18f27039c654ba08e1beb7edff
-    Reviewed-on: https://code.wireshark.org/review/6819
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2e10308
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Jan 27 15:13:46 2015 +0100
-
-    HCrt: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
-    
-    Change-Id: I453c9b068a53292ab63cd3416569eea7d66361ba
-    Reviewed-on: https://code.wireshark.org/review/6818
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 7dfda88
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jan 26 19:53:49 2015 +0100
-
-    WIMAX: fix no previous prototype for ... [-Wmissing-prototypes]
-    
-    Also comment the unused function wimax_decode_sub_dl_ul_map
-    
-    Part 2...
-    
-    Change-Id: I1836aa2851156e4f756c5697f86a142625d697c9
-    Reviewed-on: https://code.wireshark.org/review/6810
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ceb8d95
-Author: Hadriel Kaplan <hadrielk@yahoo.com>
-Date:   Sun Jan 25 14:30:13 2015 -0500
-
-    Lua: Expose tcp_dissect_pdus() to Lua
-    
-    Provide a way for Lua-based dissectors to invoke tcp_dissect_pdus()
-    to make TCP-based dissection easier.
-    
-    Bug: 9851
-    Change-Id: I91630ebf1f1fc1964118b6750cc34238e18a8ad3
-    Reviewed-on: https://code.wireshark.org/review/6778
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
-    Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
-
-commit 9bbc337
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Jan 13 15:13:27 2015 +0100
-
-    Added HPFEEDS stats_tree.
-    
-    Change-Id: I256fd5395b062fa954ebd60598721323ea1d7ff1
-    Bug: 10875
-    Reviewed-on: https://code.wireshark.org/review/6713
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c80aa10
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Jan 27 11:53:05 2015 +0100
-
-    HCrt fix no previous prototype for 'proto_register_hcrt' [-Wmissing-prototypes]
-    
-    Change-Id: Idca780885263c068ba31bbccb6009e75221b3adf
-    Reviewed-on: https://code.wireshark.org/review/6816
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 32cbf79
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jan 26 08:15:35 2015 +0100
-
-    Qt: Add checkable for Find Packet icon
-    
-    Change-Id: Idd3c0b1893a9e0f8bc329e9157baaccd10de7378
-    Reviewed-on: https://code.wireshark.org/review/6814
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b5a3907
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jan 26 08:46:34 2015 +0100
-
-    Packet List (Qt): fix extra ‘;’ [-Wpedantic]
-    
-    Change-Id: I3ac80a13da91452de4c857abfd6f2661b00e2f5d
-    Reviewed-on: https://code.wireshark.org/review/6815
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 77227d4
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jan 26 08:00:43 2015 +0100
-
-    GTK: Fix multispace on main title bar
-    
-    Change-Id: I275a586c16621fdfabede23f6a1d03c8d8556b3f
-    Reviewed-on: https://code.wireshark.org/review/6813
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 5e309d6
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jan 26 07:48:55 2015 +0100
-
-    CAPWAP: fix double space on AC Software version
-    
-    Change-Id: Ibe9715a1c2bf31e31ddda5ad2ad62fc0eda8164c
-    Reviewed-on: https://code.wireshark.org/review/6812
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ec7ff4e
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jan 26 08:48:57 2015 +0100
-
-    GTK: fix no previous prototype for ... [-Wmissing-prototypes]
-    
-    Add by commit g43f09e67b (Remove unneeded includes from ui folder)
-    
-    Change-Id: I66eb113430bde97e18bb3d2b00f6bac46a01797e
-    Reviewed-on: https://code.wireshark.org/review/6809
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a9aba94
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jan 26 08:45:36 2015 +0100
-
-    GTK: fix no previous prototype for ... [-Wmissing-prototypes]
-    
-    Add by commit g43f09e67b (Remove unneeded includes from ui folder)
-    
-    Change-Id: I7c9d9e2bbd76d062f96422c74ee8eb8c6ecd328b
-    Reviewed-on: https://code.wireshark.org/review/6808
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 11d25fa
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jan 26 08:17:06 2015 +0100
-
-    CATTP: fix no previous prototype for 'proto_register_cattp' [-Wmissing-prototypes]
-    
-    Change-Id: Ifedb45d95d622c6df29f6917918015676f506831
-    Reviewed-on: https://code.wireshark.org/review/6807
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c0c2b45
-Author: Roland Knall <roland.knall@br-automation.com>
-Date:   Mon Jan 26 15:08:18 2015 +0100
-
-    epl: Add Manufacturer subdissector
-    
-     Allow manufacturer specific plugins, which will only
-     be called for certain service IDs which are manufacturer
-     specific as defined by the POWERLINK specification.
-    
-     As with e.g. udp.port, a plugin or subdissector may
-     register with epl.asnd and a given service ID to implement
-     a plugin for specific ASND Service IDs, which are part
-     of the manufacturer specific object range (0xA0-0xFE).
-    
-     Also, all values for the ID fields have been changed to
-     range_string
-    
-    Change-Id: Ibfb9c035c16bce5322b13c42f30daf14e096712a
-    Reviewed-on: https://code.wireshark.org/review/6793
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 4fb2ec0
-Author: Joe Fowler <fowlerja@us.ibm.com>
-Date:   Fri Jan 23 22:17:50 2015 -0500
-
-    SMC-R: fix incorrect dissection of non-SMCR packet. Failover
-    Validation bit definition is missing
-    
-    dissect_smcr_tcp_heur() passes incorrect length to tvb_memeql(),
-    resulting in incorrectly identifying a packet as SMC-R.
-    
-    Added Failover Validation bit.
-    
-    Bug: 10887
-    Change-Id: I9f33389bd974b4c410a6b077d0d133221c77ee0d
-    Reviewed-on: https://code.wireshark.org/review/6765
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ee320ef
-Author: Evan Huus <eapache@gmail.com>
-Date:   Mon Jan 26 22:35:12 2015 -0500
-
-    qt: clear tree and bytes when no packet selected
-    
-    Otherwise trying to interact with them will cause all sorts of funny crashes.
-    
-    There's probably a better way to trigger these (having the widgets register for
-    a signal, and sending that signal, or something something something) but this
-    works and I don't feel like reading 20 pages of Qt documentation right this
-    instant.
-    
-    Change-Id: Ic52806ae5ba8d7776f835695590559b8c705d083
-    Ping-Bug: 10896
-    Reviewed-on: https://code.wireshark.org/review/6803
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit a835c85
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Jan 26 11:38:33 2015 -0800
-
-    Pcapng: Don't fetch past the end of a GArray.
-    
-    Due to an off-by-one error an invalid ISB interface ID could make us
-    fetch past the end of a GArray. Found using American Fuzzy Lop.
-    
-    Bug: 10895
-    Change-Id: I7d4049ad7a386ae7e8013b8e741d54a31f353f1f
-    Reviewed-on: https://code.wireshark.org/review/6798
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 5845f29
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Mon Jan 26 13:58:01 2015 -0500
-
-    rtp: Don't call col_...() under 'if (tree)'
-    
-    Change-Id: I7d75e8d02aeaa67155ec52dd0167d1692286b951
-    Reviewed-on: https://code.wireshark.org/review/6800
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit 717b5a2
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Mon Jan 26 13:31:15 2015 -0500
-
-    rtmpt: Remove 'if (tree)'
-    
-    Setting a var under 'if (tree)' and then using it later (not under 'if (tree)') to affect col_...()/expert_...() is not OK.
-    
-    Change-Id: I144b5fa50b4550cd14c604970f5d84dbf13f3e90
-    Reviewed-on: https://code.wireshark.org/review/6799
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit c9579d0
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Jan 26 16:20:16 2015 +0100
-
-    3GPP: upgrade 2G/3G NAS dissector to v12.8.0 and NAS EPS dissector to v12.7.0
-    
-    Change-Id: I770506762074b50d40b4f4742d8316368f14b4de
-    Reviewed-on: https://code.wireshark.org/review/6794
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit d5f0f25
-Author: Anders <anders.broman@ericsson.com>
-Date:   Mon Jan 26 16:50:06 2015 +0100
-
-    Add Cmakefiles missing from the distribution.
-    
-    Change-Id: I77333bb1ca4b0fdfa2db095aab2e4e663c029dd3
-    Reviewed-on: https://code.wireshark.org/review/6797
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d50b27f
-Author: Evan Huus <eapache@gmail.com>
-Date:   Sun Jan 25 09:18:00 2015 -0500
-
-    gsm-rlcmac: use wmem_new0 for a struct
-    
-    Fixes "Conditional jump or move depends on uninitialised value" from Valgrind.
-    
-    I couldn't really figure out how this code was supposed to function, it seems to
-    initialize one member of the union and then expect *all* the others to just
-    magically work (which they apparently do in most cases, oddly). The real bug
-    could be in csnStreamDissector or who knows, but this at least turns "garbage
-    data" into "zeros" which makes valgrind happy and turns a potential vuln into
-    at worst a bad decoding.
-    
-    Bug: 10891
-    Change-Id: Ia29dd625b46b3b76ff521b4203148fe8b0c59ec3
-    Reviewed-on: https://code.wireshark.org/review/6769
-    Petri-Dish: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit abf5703
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Jan 24 18:34:53 2015 -0500
-
-    Register EtherNet/IP dissector for "external" use (like SSL)
-    
-    Change-Id: Ic918c27f36569572523a17abb172b94cc32f2e3b
-    Reviewed-on: https://code.wireshark.org/review/6786
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d465682
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Jan 25 17:32:40 2015 -0500
-
-    Roll functionality of h225-persistentdata module into packet-h225.c
-    
-    Change-Id: I19b2a1b19e1e77a6456e2310daf64ddff572b0d2
-    Reviewed-on: https://code.wireshark.org/review/6788
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 155fc8f
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Jan 24 18:55:55 2015 -0500
-
-    Move #defines of epan/greproto.h to packet-gre.h
-    
-    Change-Id: I5de4c34e2acafbe47a8ca3f07040a774e72d0d3e
-    Reviewed-on: https://code.wireshark.org/review/6787
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d015eff
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jan 25 14:37:44 2015 -0800
-
-    Update another comment to reflect reality.
-    
-    Change-Id: I9747b746ed7c38ed3aa78f19ae20b61e142b94cc
-    Reviewed-on: https://code.wireshark.org/review/6785
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit fcac03d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jan 25 14:34:07 2015 -0800
-
-    Update a comment to reflect reality.
-    
-    Change-Id: I6376ce5eab43443314e73116161a24111f8c46d7
-    Reviewed-on: https://code.wireshark.org/review/6784
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 88e22bde
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jan 25 14:31:39 2015 -0800
-
-    Remove some references to SVN.
-    
-    Rename the --get-svn and --set-svn options to --get-vcs and --set-vcs;
-    continue to support --get-svn and --set-svn as aliases, for backwards
-    compatibility.  Change variable names as well.
-    
-    Change-Id: If25d81dae747f9825f7e3e5e937749f078f63d27
-    Reviewed-on: https://code.wireshark.org/review/6783
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit be798e1
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Sun Jan 25 15:51:01 2015 -0500
-
-    pana, gsm_abis_oml, rsl, netrom: Remove 'if (tree)'
-    
-    Thou shalt call col_...() and/or a dissector under 'if(tree)'
-    
-    Change-Id: Ibe62bc8229cb759d5f8b092aa7143d8e2f799037
-    Reviewed-on: https://code.wireshark.org/review/6781
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit 065304c
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Sun Jan 25 12:04:14 2015 -0500
-
-    applemidi: col_...() shouldn't be called under 'if(tree)'
-    
-    Change-Id: I6ae8e122f1d1e7200255b51d2017b4375045c797
-    Reviewed-on: https://code.wireshark.org/review/6780
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit c107896
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jan 25 13:50:37 2015 -0800
-
-    Replace "GIT" with "VCS" in make-version.pl and files it manipulates.
-    
-    That makes it more VCS-neutral - apparently some people maintain private
-    versions under VCSes other than Git, and make-version.pl still handles
-    those VCSes.
-    
-    Change-Id: Ie4914b16fea8ce800582729260c5e9b9cf1111f4
-    Reviewed-on: https://code.wireshark.org/review/6779
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit a3f3d0b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jan 25 12:50:05 2015 -0800
-
-    Don't say "Git Rev" if the VCS being used isn't Git.
-    
-    Change-Id: Ibd298b9665214e8af137a05ffb0c0aee67af91bf
-    Reviewed-on: https://code.wireshark.org/review/6777
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit bba51b6
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jan 25 12:14:58 2015 -0800
-
-    Get rid of unused is_release preference.
-    
-    Change-Id: I458f1d398b4eb566dd73e879ea3236a4de67da63
-    Reviewed-on: https://code.wireshark.org/review/6776
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2f713a6
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jan 25 12:01:54 2015 -0800
-
-    Update some comments to reflect reality.
-    
-    Change-Id: I230e3914bcd902dd481b59637f5ea21afc496978
-    Reviewed-on: https://code.wireshark.org/review/6775
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit aec1bcf
-Author: Hadriel Kaplan <hadrielk@yahoo.com>
-Date:   Sat Jan 24 15:58:30 2015 -0500
-
-    Lua can free tvbuffs too early
-    
-    Lua-created tvbuffs should be kept around for the duration of pinfo's
-    lifetime, instead of only for the duration of frame dissection. So
-    instead of using the frame dissector's frame_end_routine, we'll register
-    a callback to wmem for pinfo pool's allocator.
-    
-    Bug: 10888
-    Change-Id: I3e9db671c3f2a7cab9e258aca17f3be8acaf2417
-    Reviewed-on: https://code.wireshark.org/review/6768
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
-    Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
-
-commit 716f9a3
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Jan 25 08:06:13 2015 -0800
-
-    [Automatic manuf, services and enterprise-numbers update for 2015-01-25]
-    
-    Change-Id: Ic9c4903a49473c40f66dcf650f59d6a498bb9c05
-    Reviewed-on: https://code.wireshark.org/review/6772
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 5003654
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Sun Jan 25 09:53:25 2015 -0500
-
-    Cleanup:
-    
-    Including:
-      Remove dead initializers;
-      Remove boilerplate comments;
-      Localize some variables;
-      tvb_length...() ==> tvb_reported_length...();
-      Use TRUE/FALSE when assigning a value to a gboolean;
-      whitespace/indentaion.
-    
-    Change-Id: I09e1f15611011bbe393d23e1cb54568ddd3cebc6
-    Reviewed-on: https://code.wireshark.org/review/6771
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit b91df34
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Sat Jan 24 17:09:36 2015 -0500
-
-    v52: Fix a minor bug introduced in  gc71e88e; plus ...
-    
-    Create/use extended value strings
-    tvb_length...() --> tvb_reported_length...()
-    
-    Cleanup:
-     Remove some dead initializers;
-     Declare some vars as 'const' (initialized value is never changed);
-     localize some vars;
-     whitespace;
-    
-    Change-Id: Iee21bb67fb42b1160b8ba2b7c2b89b410cc22225
-    Reviewed-on: https://code.wireshark.org/review/6770
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit 5280188
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Jan 12 14:31:16 2015 +0100
-
-    Added HCrt (Hotline Command-Response Transaction) Dissector.
-    
-    Bug: 10853
-    Change-Id: Ieddb98b16e47906ba187cf03669b02a3ad397d60
-    Reviewed-on: https://code.wireshark.org/review/6533
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit b2a5f15
-Author: Evan Huus <eapache@gmail.com>
-Date:   Sat Jan 24 13:01:30 2015 -0500
-
-    RTPS: Memset entire buffer
-    
-    Apparently some compilers do sufficient inlining optimization to notice that
-    there's at least one caller of rtps_util_add_typecode which passes an
-    indent_level of 0. Such compilers are *also* picky enough to complain about
-    memset being called with a length of 0, leading to a warning which we turn into
-    a compile error.
-    
-    I thought about putting in an "if indent_level > 0" but I figure memsetting the
-    entire buffer (length >= 1) is simpler and more efficient in the common case.
-    
-    Change-Id: Ica21ba988eb0c1251e7b4ef2e110336d5ee32837
-    Reviewed-on: https://code.wireshark.org/review/6766
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit cf142c6
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sat Jan 24 10:28:56 2015 -0800
-
-    Get Wireshark to compile with afl-gcc.
-    
-    Fix errors found by American Fuzzy Lop's afl-gcc
-    (http://lcamtuf.coredump.cx/afl/):
-    
-    peektagged.c:
-    error: 'fileVersion' may be used uninitialized in this function
-    
-    packet-h223.c:
-    error: variable 'circuit_id' might be clobbered by 'longjmp' or 'vfork'
-    
-    wslua_proto.c:
-    error: variable 'd' might be clobbered by 'longjmp' or 'vfork'
-    
-    wslua_proto.c:
-    error: variable 'dt' might be clobbered by 'longjmp' or 'vfork'
-    
-    Change-Id: Idd74a3ad7b236d3a8756c1e7e917b1c74143f381
-    Reviewed-on: https://code.wireshark.org/review/6767
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 7ed097c
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Jan 23 13:29:52 2015 -0800
-
-    Fix an uninitialized variable warning.
-    
-    Change-Id: I3a5c211db767e1980a8c1f2fd706139c0bf6f943
-    Reviewed-on: https://code.wireshark.org/review/6764
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit b714da2
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Jan 23 12:09:51 2015 -0800
-
-    CMake: Make sure DATAFILE_DIR exists.
-    
-    Create DATAFILE_DIR when we're building an application bundle. Hopefully
-    this will fix the build error on the OS X x86 builder.
-    
-    Change-Id: I57414bcd87ab21958ae8131a8cd77951b29e02f7
-    Reviewed-on: https://code.wireshark.org/review/6763
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 21dfda6
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Jan 23 09:18:29 2015 -0800
-
-    Qt: Remove windowIcon property from our .ui files.
-    
-    Setting the windowIcon property in foo.ui means we end up with a
-    setWindowIcon call in ui_foo.h. Along with setting the window title
-    bar icon, it also sets the taskbar icon on Windows. A 16x16 PNG gives
-    us a jaggy taskbar icon. (Windows ICO format is supported via a plugin
-    which might not be available everywhere, otherwise we could try using
-    a .ico resource.)
-    
-    Move the setWindowIcon call from ge990d1b to the top of the MainWindow
-    constructor and enable it everywhere.
-    
-    Change-Id: I4e9765200bb3676c4faa8e0ab1505ce02fb64870
-    Reviewed-on: https://code.wireshark.org/review/6762
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit d8d2d8e
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Fri Jan 23 15:09:50 2015 +0000
-
-    jpeg: Add handling for comment marker
-    
-    Change-Id: I10ad7021f6535d65d88faf734fb5800e4415a811
-    Reviewed-on: https://code.wireshark.org/review/6759
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-
-commit cce3ad2
-Author: Petr Gotthard <petr.gotthard@honeywell.com>
-Date:   Tue Jan 20 19:04:05 2015 +0100
-
-    Correctly dissect the AMQP 0-9 heartbeat frames. The heartbeat frames were
-    incorrectly highlighted as erroneous.
-    
-    Change-Id: I94f8ef73e2432543ae3965da3789f27e872951ea
-    Reviewed-on: https://code.wireshark.org/review/6685
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b32e39e
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Jan 20 12:26:14 2015 -0800
-
-    Test suite: Add verbosity to the HTTP2 test.
-    
-    We should probably do the same for the other decryption tests but we're
-    having issues with HTTP2 right now.
-    
-    Change-Id: I8e8f5da200a29a5ca1cddb39c082bb7ee12d1eaf
-    Reviewed-on: https://code.wireshark.org/review/6686
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit f5c0bd2
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Jan 23 09:56:28 2015 +0100
-
-    802.11: Fix encoding for VHT NDP STA Info
-    
-    Using little endian for encoding
-    
-    Ping-Bug: 10786
-    Change-Id: Ic2a7f52ccbba32a801c102df4e5aa0a792654602
-    Reviewed-on: https://code.wireshark.org/review/6755
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit bab7447
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Dec 7 14:30:50 2014 +0100
-
-    CAPWAP: Add support of Fortinet Vendor Specific Element
-    
-    Based from FortiAP/WiFi 5.2.x
-    
-    Change-Id: Ia78d15d54db01939a3d91947db39e35b3abc2519
-    Reviewed-on: https://code.wireshark.org/review/5646
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e990d1b
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Jan 22 16:48:17 2015 -0800
-
-    Try to fix the jaggy taskbar icon.
-    
-    Possibly related to https://bugreports.qt.io/browse/QTBUG-19441.
-    
-    Change-Id: Idf7ff8a247f459ce465907760ca0ebeaff2cffa8
-    Reviewed-on: https://code.wireshark.org/review/6746
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 888229b
-Author: Hadriel Kaplan <hadrielk@yahoo.com>
-Date:   Thu Jan 22 22:40:01 2015 -0500
-
-    Make netlink dissector register the attribute length header field info
-    
-    The header field info variable named hfi_netlink_len isn't registered
-    by the netlink dissector, but is added to the tree, resulting in a
-    runtime error. This commit changes the variable name slightly, to
-    be more accurate, and correctly registers it.
-    
-    Bug: 10884
-    Change-Id: Iaa4e556d5bbe87b72a0cdca2fbf397fa95e074cc
-    Reviewed-on: https://code.wireshark.org/review/6751
-    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 407b703
-Author: Hadriel Kaplan <hadrielk@yahoo.com>
-Date:   Fri Jan 23 00:04:18 2015 -0500
-
-    Fix some WsLua documentation errors
-    
-    The format of the API chapter was a bit screwed up, as was the
-    indentation level of attributes. Also, some functions introduced
-    in 1.11.3 were not documented as being since that version.
-    
-    Change-Id: I7912488c6da5b5ae72933e4c5ce49f8fbf0b0e34
-    Reviewed-on: https://code.wireshark.org/review/6753
-    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 8d1a984
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Fri Jan 23 00:24:46 2015 -0500
-
-    Remove incorrect 'if (tree)'
-    
-    Incorrect because of one or both of the following:
-    - col_...()/expert...() called under 'if (tree)'
-    - vars set under 'if (tree)' used later (not under 'if (tree)'
-       as args to col_...()/expert_...()
-    
-    Change-Id: I89f7d453f2d6eaa40d51cbd794ed2c9be7e549de
-    Reviewed-on: https://code.wireshark.org/review/6754
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit 5a23a02
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jan 22 19:33:37 2015 -0800
-
-    Add .dirstamp - it's apparently some autotools thing.
-    
-    Change-Id: I3303744858d807b1472c2e53ff6d886270664be2
-    Reviewed-on: https://code.wireshark.org/review/6752
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 19a8eaf
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jan 22 13:04:15 2015 -0800
-
-    Use luaL_{check,opt}integer() rather than luaL_{check,opt}int().
-    
-    Lua prior to 5.3 defined luaL_{check,opt}int() as macros wrapping
-    luaL_{check,opt}integer() with a cast to int; Lua 5.3 doesn't.
-    
-    It sounds as if the Lua developers are deprecating luaL_{check,opt}int():
-    
-        http://osdir.com/ml/general/2014-10/msg46568.html
-    
-    Change-Id: I2d0b649dcd57ede124f31d39f7945f342ae9b18f
-    Reviewed-on: https://code.wireshark.org/review/6744
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
-
-commit 2eaa467
-Author: Evan Huus <eapache@gmail.com>
-Date:   Thu Jan 22 20:53:24 2015 -0500
-
-    oids: fix memory leak
-    
-    In oid_encoded2subid_sub(), the scope we get may be NULL, in which case if we
-    don't return our allocated buffer, it is our responsibility to free it. Minor
-    regression from ge333e4c90f0aca41b0a56cef22fd80d0b0e73e14.
-    
-    Bug: 10883
-    Change-Id: I324ca770278ab0575511c5e9ab72b70d6ac1a391
-    Reviewed-on: https://code.wireshark.org/review/6748
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit 612e286
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jan 22 17:51:48 2015 -0800
-
-    Fix test script to test Lua Pinfo, and fix problem it found.
-    
-    The test script was running lua/nstime.lua rather than lua/pinfo.lua for
-    the Pinfo test, and the Pinfo test was testing the ipproto property for
-    a Pinfo, but that was removed.
-    
-    Change-Id: Iccdccd265dd550e41640af3acd607362f1f2f02e
-    Reviewed-on: https://code.wireshark.org/review/6747
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5b55288
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Thu Jan 22 14:39:55 2015 -0500
-
-    Add a changelog entry for the license tag change (I82de1bc4ffcb1e962b1a35dc58aaa87aca04ed5e).
-    
-    Change-Id: I5e715579be9b415cd0fd957c66c7bd82319c88b3
-    Reviewed-on: https://code.wireshark.org/review/6743
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-
-commit 96f9746
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Thu Jan 22 12:05:57 2015 -0500
-
-    pppoe: col_...()/expert...() shouldn't be under 'if (tree)'
-    
-    Change-Id: I93726546d86af677153b6b2d46fc072851a33460
-    Reviewed-on: https://code.wireshark.org/review/6741
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit f38a63a
-Author: Stefan Metzmacher <metze@samba.org>
-Date:   Tue Sep 23 23:11:25 2014 +0200
-
-    packet-smb2: implement SMB2 NegotiateContexts
-    
-    Change-Id: I0a2c7ffa2490196989dce96b659337b4fee92c7e
-    Signed-off-by: Stefan Metzmacher <metze@samba.org>
-    Reviewed-on: https://code.wireshark.org/review/6711
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 48c90d1
-Author: Stefan Metzmacher <metze@samba.org>
-Date:   Tue Sep 23 23:12:29 2014 +0200
-
-    packet-smb2: fix getting the dataoffset in dissect_smb2_write_request()
-    
-    It's 2 byte only so we need to use tvb_get_letohs().
-    
-    Change-Id: Idbab6428f4242abbbff089d7e1d1bf4cc86930b1
-    Signed-off-by: Stefan Metzmacher <metze@samba.org>
-    Reviewed-on: https://code.wireshark.org/review/6710
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 97d0f36
-Author: Stefan Metzmacher <metze@samba.org>
-Date:   Wed Jan 21 08:17:19 2015 +0100
-
-    packet-smb2: correctly dissect dcerpc traffic over different named pipe handles
-    
-    Change-Id: Id98d1c7e28d88f6cd50f5ef770eec95e57008458
-    Signed-off-by: Stefan Metzmacher <metze@samba.org>
-    Reviewed-on: https://code.wireshark.org/review/6709
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 749c68c
-Author: Stefan Metzmacher <metze@samba.org>
-Date:   Wed Jan 21 08:14:23 2015 +0100
-
-    packet-dcerpc: change transportsalt to guint64
-    
-    This will be able to hold also SMB2 file ids and maybe other stuff in future.
-    
-    Change-Id: Ib55895a346b7dc6562291730693453728c99fe91
-    Signed-off-by: Stefan Metzmacher <metze@samba.org>
-    Reviewed-on: https://code.wireshark.org/review/6708
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 87e691f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jan 22 03:05:34 2015 -0800
-
-    Remove a mysterious comment that no longer applies.
-    
-    There's nothing special about LUA_VERSION when it comes to the user
-    overriding it - they'd do that by changing it, the same as with any
-    other _VERSION variable.  Remove the comment about it, which is now out
-    of date in any case.
-    
-    Change-Id: I414ddaff43c96304f49b81bdbd135d85536c17dc
-    Reviewed-on: https://code.wireshark.org/review/6739
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 39a984e
-Author: Bastien Bailly <babassbailly@free.fr>
-Date:   Thu Jan 22 09:50:37 2015 +0100
-
-    GTP: Bad bytes read for extended rnc id value
-    
-    offset+=2; is missing and bytes used for extended rnc id value are the same that for rnc id value.
-    
-    Bug:10877
-    Change-Id: I2830191e434812d42ab625e7a6e0478a191b7d95
-    Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/6738
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit f8fa70f
-Author: Marko Hrastovec <marko.hrastovec@gmail.com>
-Date:   Wed Jan 21 15:03:43 2015 +0100
-
-    Decoding of Asterix categories 063 and 065 extended to item decoding.
-    
-    Categories 063 and 065 were decoded only partially. Now the dissector
-    dissects all the items in these two categories.
-    
-    Change-Id: Ib8fd1d18327cbea668600f7376a6b83a270909a2
-    Reviewed-on: https://code.wireshark.org/review/6714
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit dadf2c1
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jan 22 00:32:28 2015 -0800
-
-    Lua 5.3.0 is now out; install it.  (It has better 64-bit integer support.)
-    
-    Change-Id: I99cad6bd6c5646bfbaddfdde317673cf749766a8
-    Reviewed-on: https://code.wireshark.org/review/6737
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2cd0472
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jan 22 00:30:47 2015 -0800
-
-    Un-install and re-install if the installed and specified versions differ.
-    
-    If, for a package, the version specified by the _VERSION variable
-    doesn't match the version installed (as indicated by a -done file),
-    un-install it, and remove the downloaded version, before doing any
-    installs, so that the specified version replaces the installed version.
-    
-    Change-Id: I32021c7be8cdc277ad51c9f11cfdb57e3bb542c4
-    Reviewed-on: https://code.wireshark.org/review/6736
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5a928c2
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jan 22 00:18:40 2015 -0800
-
-    Remove autotools packages if something they depend on changes.
-    
-    Uninstall automake if autoconf is going to be changed; remove libtool if
-    autoconf or automake is going to be changed.
-    
-    Change-Id: I4aced967cb7bed197d3f1a4be851a0bc78c8f12d
-    Reviewed-on: https://code.wireshark.org/review/6735
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2cc9474
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jan 21 20:15:05 2015 -0800
-
-    When uninstalling a library, first uninstall what depends on it.
-    
-    Change-Id: I80a719acd90e225b28ca16a24ca74030498a5a42
-    Reviewed-on: https://code.wireshark.org/review/6734
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 0fbb25f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jan 21 20:05:23 2015 -0800
-
-    Rename install_libpixman to install_pixman, to match uninstall_pixman.
-    
-    Change-Id: If71895cae49000ff4a4b5bb8211f0b21feed82bc
-    Reviewed-on: https://code.wireshark.org/review/6733
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit b7db12e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jan 21 18:40:49 2015 -0800
-
-    Do tests in the order the comment before them implies.
-    
-    Change-Id: Ie82ce54915866bdf635da832dd2f4c4ae1f2937e
-    Reviewed-on: https://code.wireshark.org/review/6732
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 64108f4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jan 21 18:30:26 2015 -0800
-
-    Give PortAudio a versioned -done file.
-    
-    If there's an unversioned -done file, make it a versioned file under the
-    assumption that the requested version is what's installed.
-    
-    Create a versioned file when installing.  Use the installed version when
-    uninstalling, and remove the versioned file.
-    
-    Change-Id: Ic21e0f139bb35df8f159a5ba7732706357a099fb
-    Reviewed-on: https://code.wireshark.org/review/6731
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 0426236
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Tue Jan 20 20:41:49 2015 -0500
-
-    Get us building with the subdir-objects automake option.
-    
-    subdir-objects will be enabled unconditionally in automake-2.0 and
-    automake-1.14 gives us warnings about the upcoming change.
-    
-    Rework I1b3c517f08d3c752ee03cb89482ee4951ceb5bf3 (and
-    I416f2d3611fb61659b9a7f7285e5f54a354fbe7d) to give wslua/make-reg.pl the directory of
-    the source files rather than the full path to each.
-    
-    In echld don't use sources in the top-level directory in libechld: it breaks
-    distclean with subdir-objects turned on.
-    
-    Bug: 10648
-    Change-Id: I404b074f1558376064c35d8fc96aea7e3d042a76
-    Reviewed-on: https://code.wireshark.org/review/6697
-    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>
-
-commit d93a90b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jan 21 18:09:30 2015 -0800
-
-    Make the individual install_ and uninstall_ functions idempotent.
-    
-    Move the "do I want this and, if so, is it already installed?" checks
-    into the install_ functions.
-    
-    Move the "is this already installed?" checks into the uninstall_
-    functions, and have them clear the appropriate installed version
-    variable when finished.
-    
-    Also, fetch the installed versions early in the main line.
-    
-    Change-Id: I9e5d8ca48285c6d424a4a2a5f53f4aa449a891d3
-    Reviewed-on: https://code.wireshark.org/review/6730
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 33c1858
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jan 21 16:27:09 2015 -0800
-
-    Pull the installs into a function.
-    
-    Call it install_all to avoid collision with the OS's install command, if
-    any; rename the uninstall function to uninstall_all to match.
-    
-    Change-Id: I9383424ff3910f04244493569fed3e5bc5d3d99d
-    Reviewed-on: https://code.wireshark.org/review/6729
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 16f2147
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jan 21 16:17:07 2015 -0800
-
-    Pull the install and uninstall sequences into functions.
-    
-    That lets us put the install and uninstall sequences for a particular
-    tool or library together, and separates them from the overall
-    installation and uninstallation flow.
-    
-    Change-Id: I5e7def9983b587ba7c3276a9d5762db340a04802
-    Reviewed-on: https://code.wireshark.org/review/6728
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit f7d9334
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Jan 21 16:55:47 2015 -0500
-
-    isakmp: col_...() shouldn't be called under 'if (tree)'
-    
-    Change-Id: I6fa497ca99e2ad3b675697fd28eeafd61190a17c
-    Reviewed-on: https://code.wireshark.org/review/6726
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit bc5c484
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Jan 21 15:49:12 2015 -0500
-
-    Remove some dead initializers
-    
-    Change-Id: I16c88b5e8f6e79a0d9b33b9c3c4d94f77ecfdfa2
-    Reviewed-on: https://code.wireshark.org/review/6723
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit b0f37ba
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Jan 21 15:33:36 2015 -0500
-
-    vcdu: minor cleanup
-    
-    - Remove dead initializers (and localize some vars);
-    - proto_item_set_len() takes a 'proto_item *';
-    - Use gboolean for a TRUE/FALSE var;
-    - Remove a set of unneeded brackets.
-    
-    Change-Id: Ic7b27e2cd321c9d307c01cc4afdb0fc4c6d3cd55
-    Reviewed-on: https://code.wireshark.org/review/6722
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit 0671965
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Jan 21 15:12:40 2015 -0500
-
-    usb-hid: fix 2 minor bugs and some dead initializers
-    
-    One bug was introduced in g4d58904
-    
-    Change-Id: I16a5e83f11f48038945e957c7e6ce9d50b4aec46
-    Reviewed-on: https://code.wireshark.org/review/6721
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit 32ab59f
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Jan 21 14:27:46 2015 -0500
-
-    synphasor: General cleanup
-    
-    - col_...() shouldn't be under 'if (tree)';
-    - remove dead initializers;
-    - use proto_tree_add_subtree() in place of ..._add_text()/...add_subtree()
-       in one more instance;
-    - tvb_length() --> tvb_reported_length();
-    - use 'proto tree *' variable instead of incorrect 'proto_item *' var in
-       one instance;
-    - use SYNP_... for a few macro names to prevent any possible
-       namespace collisions;
-    - fix some long-lines, indentation and whitespace.
-    
-    Change-Id: I4e0a2e5d0b5e13b72a14ec6dd3779a7104534445
-    Reviewed-on: https://code.wireshark.org/review/6720
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit 009ca9f
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Jan 21 11:41:34 2015 -0500
-
-    srvloc: fix a very minor bug
-    
-    Change-Id: I822602c569fd6241757ceb558224c255937f3130
-    Reviewed-on: https://code.wireshark.org/review/6719
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit 3dc1b4e
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Jan 21 11:38:33 2015 -0500
-
-    ieee802154: (trivial) proto_item_set_len() takes a 'proto_item *'
-    
-    Change-Id: I83945ccf73e2c8f355a3ff843271d35143758b1d
-    Reviewed-on: https://code.wireshark.org/review/6718
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit e1f4f53
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Jan 21 15:00:56 2015 +0100
-
-    HPFEEDS: cleanup in the dissector code.
-    
-    Change-Id: Ia675fb703811c4b6be6a278d9396a917dfcf982d
-    Reviewed-on: https://code.wireshark.org/review/6715
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit fb1e149
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Jan 21 08:41:19 2015 -0800
-
-    NSIS: Simplify wireshark.nsi.
-    
-    Replace a pile-o-ifdefs with generated include files. This should make
-    it easier to add an NSIS target to CMake.
-    
-    Drop ICONV_DIR and ADNS_DLL. We haven't used either for quite a while.
-    
-    Change-Id: I71b08cccdb9fe2b2a166b63848a9ded5ebc5f873
-    Reviewed-on: https://code.wireshark.org/review/6717
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 163071e
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Jan 21 10:06:33 2015 +0100
-
-    GSM SIM: for a FETCH command, a Le of 0 means 256 bytes
-    
-    Change-Id: Ia8969747c215a5ba7e9242b6266114b0e9e00859
-    Reviewed-on: https://code.wireshark.org/review/6712
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 17a1748
-Author: Josip Medved <jmedved@jmedved.com>
-Date:   Tue Jan 20 23:42:17 2015 -0800
-
-    Updated NSN dictionary with vendor-specific Sy application AVPs.
-    
-    Change-Id: I4cd9bd7f7219e4d9ff1bb8a71fab32439a8a9a35
-    Reviewed-on: https://code.wireshark.org/review/6705
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 6c728d5
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jan 21 01:00:43 2015 -0800
-
-    Support Sun^WOracle C's -xldscope=hidden for hiding externals.
-    
-    Change-Id: Id9c852f384a4450b82c8d596f4628d1ccbcf95bc
-    Reviewed-on: https://code.wireshark.org/review/6707
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2ee0ea0
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Jan 20 23:22:40 2015 +0100
-
-    IEEE 802.15.4: fix display of 64 bits address (broken in gecaa1f8)
-    
-    Change-Id: I1fc117ac6522b4df53ceafb635aeb3b1f34a54d3
-    Reviewed-on: https://code.wireshark.org/review/6695
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit ed413e9
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Tue Jan 20 21:44:49 2015 -0500
-
-    Link only the GUIs with SBC (if we have SBC).  The other programs don't
-    (yet) use libcodec.
-    
-    Also, there's no need to explicitly call pkg-config to get SBC's
-    CFLAGS and LIBS: PKG_CHECK_MODULES does that for you.
-    
-    Change-Id: Ia7aa84bb81b8223773661ae2dc663731acaf6c6b
-    Reviewed-on: https://code.wireshark.org/review/6700
-    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 46fabdc
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Tue Jan 20 22:00:24 2015 -0500
-
-    Make the license tag in the RPM more specific: Wireshark is GPLv2+.
-    
-    Change-Id: I82de1bc4ffcb1e962b1a35dc58aaa87aca04ed5e
-    Reviewed-on: https://code.wireshark.org/review/6701
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit bc86257
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jan 20 23:27:08 2015 -0800
-
-    Also support -xarch=sse_42 in the Sun C compiler for x86(-64).
-    
-    Change-Id: Ib6d0ae9c237b96568e2522d2077b311b3ac5af2e
-    Reviewed-on: https://code.wireshark.org/review/6706
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit db6f733
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jan 20 20:39:09 2015 -0800
-
-    Always set the COMPILE_FLAGS property, so we can always fetch it.
-    
-    If we aren't adding -Werror, just set it to a null string, so when we
-    fetch it to add the SSE 4.2 flag to it for ws_mempbrk_sse42.c, it
-    doesn't fail.
-    
-    Change-Id: I53858130c025e094ed8d0d975451961506fb1a39
-    Reviewed-on: https://code.wireshark.org/review/6704
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 41cbbc2
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jan 20 20:32:27 2015 -0800
-
-    Don't set SSE4_2_FLAG to -msse4.2 unless -msse4.2 works.
-    
-    Change-Id: I54eca86d53dc0e4015a15491b9adfdfe9ef9e346
-    Reviewed-on: https://code.wireshark.org/review/6703
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 8a0bd92
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jan 20 19:17:36 2015 -0800
-
-    Check whether we can use nmmintrin.h.
-    
-    If we think the compiler supports SSE 4.2, check whether we can use
-    nmmintrin.h if we tell the compiler to compile with SSE 4.2 support; if
-    not, disable SSE 4.2 support.
-    
-    This matches what we do in autotools.
-    
-    Change-Id: I474d53d2fe7e2628faca7309efd7155b63bd7eab
-    Reviewed-on: https://code.wireshark.org/review/6702
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 8051657
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Mon Jan 12 15:16:03 2015 -0500
-
-    Modernize the description of Wireshark given in the RPM info.
-    
-    The initial suggestions came from Michal Labedzki on
-    https://code.wireshark.org/review/#/c/4178
-    
-    Change-Id: Iae04d667f70ae73b46d2edc1645c238ef6efc518
-    Reviewed-on: https://code.wireshark.org/review/6511
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: Niels de Vos <devos@fedoraproject.org>
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-
-commit 64f4287
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jan 20 18:46:10 2015 -0800
-
-    Get rid of trailing blank.
-    
-    Change-Id: Ia1bbd632fe00cfe6b919aacc0cd198953211fe7f
-    Reviewed-on: https://code.wireshark.org/review/6699
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit bf23953
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jan 20 18:44:17 2015 -0800
-
-    Only turn -msse4.2 on for ws_mempbrk_sse42.c, and don't always build it.
-    
-    Move all the SSE 4.2 stuff to wsutil/CMakeLists.txt.
-    
-    Don't put ws_mempbrk_sse42.c in WSUTIL_FILES by default; add it if we
-    think the compiler supports compiling for SSE 4.2.
-    
-    Add -msse4.2 to its COMPILE_FLAGS, but don't add it to any other
-    compiler flags - we don't want to build anything else with -msse4.2 by
-    default, as the only code that uses SSE 4.2 instructions but *only* does
-    so if the processor supports it is our mempbrk implementation.  (And
-    *add* it, don't *replace* the existing flags with -msse4.2; that way,
-    -Werror is left in there as well.)
-    
-    Change-Id: I979b37a37e4b88b3af11e2275e89441118c8ce0a
-    Reviewed-on: https://code.wireshark.org/review/6698
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit f215102
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jan 20 16:29:06 2015 -0800
-
-    Handle CFLAGS disabling SSE 4.2.
-    
-    When checking whether nmmintrin.h works, add -msse4.2 at the *beginning*
-    of CFLAGS, so that user (or Gentoo build process) settings with
-    -mno-sse4.2 override it.
-    
-    Bug: 10792
-    Change-Id: I1b77c2a092360a86bc7012d29642ff3303b60812
-    Reviewed-on: https://code.wireshark.org/review/6696
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5f70fd6
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Jan 20 16:44:10 2015 -0500
-
-    dsi: fix a trivial bug
-    
-    Change-Id: Ieafbd148211154a465ab1ce8fe36d2110882c458
-    Reviewed-on: https://code.wireshark.org/review/6694
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit d2d699a
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Jan 20 10:05:06 2015 -0500
-
-    Move all SigComp functionality to the SigComp dissector.
-    
-    While it does make packet-sigcomp.c much bigger, there's no reason for it to be in epan directory.
-    
-    Change-Id: I2d78c32de1d56e76578e610d4df586b5610d1b49
-    Reviewed-on: https://code.wireshark.org/review/6682
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 160af3c
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Jan 20 22:20:54 2015 +0100
-
-    HTTP2: fix test failure on Solaris SPARC
-    
-    Do not make any assumption on the endianness: not all hosts running Wireshark are little endian
-    
-    Change-Id: I8792904f7000b4f2b9e44ffe41f350ba8b4932d4
-    Reviewed-on: https://code.wireshark.org/review/6693
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 74ed8b5
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jan 19 13:10:59 2015 +0100
-
-    Add DNS stats to release-notes
-    
-    Remove in NEWS by gca174999
-    
-    Change-Id: I000b7d6421db247dcafacfa73ef049e938d42cc5
-    Reviewed-on: https://code.wireshark.org/review/6650
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-
-commit 0169cc8
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Jan 20 15:26:54 2015 -0500
-
-    Remove some dead initializers
-    
-    Change-Id: I0478fa5c476a1914ae0c18feafc7720dd3111d84
-    Reviewed-on: https://code.wireshark.org/review/6690
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit eefd529
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Jan 20 15:23:50 2015 -0500
-
-    bpdu: Fix minor bug introduced in g188aa9a
-    
-    Change-Id: Ibce8848dded5896223af117a85bc0b6e321160e8
-    Reviewed-on: https://code.wireshark.org/review/6689
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit 2c312b6
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Jan 20 14:47:23 2015 -0500
-
-    acn: col_...() shouldn't be called under 'if (tree)'
-    
-    Change-Id: I4d7d1826391b0ac12ef6ad184e7c79d279db5e28
-    Also: remove some dead initializers.
-    Reviewed-on: https://code.wireshark.org/review/6688
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit c0a403a
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Jan 20 14:18:53 2015 -0500
-
-    6lowpan: Fix a few minor bugs; Also: Misc
-    
-    (Bugs were introduced in gf5e2b42);
-    Misc:
-        Localize a few variables;
-        Remove some dead initializers.
-    
-    Change-Id: Ib7493740ecf29ed9f753475f721b47a64f54a278
-    Reviewed-on: https://code.wireshark.org/review/6687
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit f63628d
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Jan 20 09:43:33 2015 -0800
-
-    CMake: Use wrapper scripts instead of symlinks.
-    
-    When building an application bundle, create wrapper scripts at the top
-    level instead of symlinking to each executable.
-    
-    Change-Id: I080e43de545a709b29c1d6b6c6ec416e5a5a8247
-    Reviewed-on: https://code.wireshark.org/review/6683
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 5268d7f
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Jan 20 12:51:08 2015 -0500
-
-    cattp: Minor tweaks and whitespace changes
-    
-    Change-Id: I128318ffb385930f00675030227e0048306a9f4c
-    Reviewed-on: https://code.wireshark.org/review/6684
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit 6e6a129
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sun Jan 18 13:27:13 2015 -0800
-
-    CMake: Set an output directory for plugins.
-    
-    Redefine PLUGIN_DIR similar to DATAFILE_DIR and use it on all
-    platforms. Add WiresharkPlugin.cmake so that we can start defining common
-    macros for plugins/*/CMakeLists.txt. Load plugins in out-of-tree builds.
-    
-    Change-Id: I8c1359ed3cf8a71788b8320ff89dfe2d3969def2
-    Reviewed-on: https://code.wireshark.org/review/6640
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit af3924a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Jan 8 17:04:05 2015 +0100
-
-    HTTP2: Add HPACK decode to test suite
-    
-    Change-Id: Ic84942b78a795974d6e2023751245ad98b8f1142
-    Reviewed-on: https://code.wireshark.org/review/6415
-    Reviewed-by: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b2e172a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Jan 13 10:41:32 2015 +0100
-
-    DHCP/BOOTP: Option 125 Suboption: (5) fix display Modem Capabilities
-    
-    Only display dissect of Modem Capabilites when sub option = 5
-    Actually, it is always display when ftype == special (like sub option = 0)
-    
-    Change-Id: I5b75654b750bae5ae5022adcb5e8dd055ce6b291
-    Reviewed-on: https://code.wireshark.org/review/6519
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit f3cbee6
-Author: Evan Huus <eapache@gmail.com>
-Date:   Mon Jan 19 11:55:01 2015 -0500
-
-    NCP2222: fix possible buffer-overflow
-    
-    Caught by ASAN (thanks Alexis!)
-    
-    Change-Id: Ibbe2c405ba1a3ba0d5a5b9ffff9e95282526028b
-    Reviewed-on: https://code.wireshark.org/review/6652
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 1af7b97
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Jan 19 23:12:25 2015 +0100
-
-    Bug fix in json dissector that made the heuristic fail.
-    
-    Change-Id: Iff53cfd8fd9d760b04c638c87f8a44587b268cd7
-    Reviewed-on: https://code.wireshark.org/review/6674
-    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: Anders Broman <a.broman58@gmail.com>
-
-commit 11e557a
-Author: Matthieu Texier <matthieu@texier.tv>
-Date:   Thu Jan 15 18:24:20 2015 +0100
-
-    ISIS: Making a segregated function for sub-tlv used by multiple tlv
-    
-    Change-Id: Ifda28dea4b5282ea01a51cdcb3297aeeeb2a848d
-    Reviewed-on: https://code.wireshark.org/review/6550
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 8c15ac4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jan 19 18:32:42 2015 -0800
-
-    Possibility -> certainty.
-    
-    Change-Id: I03440a9b4ca13399aa14f3baaabd7aa40a843f28
-    Reviewed-on: https://code.wireshark.org/review/6678
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit f16e8fb
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Jan 19 13:33:01 2015 -0800
-
-    pdb_zip_package: Enable multithreaded compression.
-    
-    Change-Id: If72c65663abb7e3bf1a436d1ecb5eb84f67ad3f8
-    Reviewed-on: https://code.wireshark.org/review/6677
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit c3ad53f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jan 19 16:47:55 2015 -0800
-
-    Fix one item.
-    
-    We *do* get the absolute path of the executable, so we *could* look for
-    "run" right before the executable name.  The issue is that there's not
-    the stronger libtool-imposed convention that the executable is in
-    ".libs", so the chances of a false positive or false negative are
-    higher.
-    
-    Change-Id: Ib2d5f370d50fee07479c4ffe6f90ba4a91c7f271
-    Reviewed-on: https://code.wireshark.org/review/6676
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7c69079
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Jan 19 13:33:01 2015 -0800
-
-    CMake: Add a pdb_zip_package target.
-    
-    Add a "pdb_zip_package" target similar to the NMake pdb_zip target.
-    
-    Change-Id: I23d114a63fa05f722ee90b77ea458d9e496e5bf9
-    Reviewed-on: https://code.wireshark.org/review/6673
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit bea25fa
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jan 19 13:10:22 2015 -0800
-
-    The times in question are local, not UTC.
-    
-    Revert to the older code, but just show the time as "Not representable"
-    if gmtime() fails.
-    
-    Change-Id: I435facc042e3ca35fb07292a4b2657ccdfd02abb
-    Reviewed-on: https://code.wireshark.org/review/6672
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 58d9ca8
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Jan 11 16:46:36 2015 +0100
-
-    add some more apdus to the apdu table
-    
-    Change-Id: Id5e5efea46e9ff6196607e56f0212fb083e8635c
-    Reviewed-on: https://code.wireshark.org/review/6670
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 6c02abf
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Jan 11 15:14:21 2015 +0100
-
-    start dissecting the ZVT authentication apdu
-    
-    add a length paramenter to the body dissection functions in the apdu table
-    
-    Change-Id: I4abbd9078fd36385a816963ab042f443e3c26b60
-    Reviewed-on: https://code.wireshark.org/review/6669
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 4fc8286
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Jan 11 13:41:27 2015 +0100
-
-    display the control field text in the info col
-    
-    Change-Id: I3dc0f58b4861a08be687214cae9c6681ebcac286
-    Reviewed-on: https://code.wireshark.org/review/6668
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit c846af1
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Jan 11 12:45:39 2015 +0100
-
-    continue the dissection of ZVT APDUs
-    
-    define an apdu table with the direction, minimum length
-    and a fuction to dissect the apdu payload
-    
-    set the source and destination address columns depending on the apdu
-    
-    add some entries to the apdu table
-    
-    Change-Id: I52bd15bfab7bbe6c97dfe64084e69a51e65a8a6e
-    Reviewed-on: https://code.wireshark.org/review/6667
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 71d83aa
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Mon Jan 19 07:04:48 2015 +0100
-
-    tvb_length() -> tvb_captured_length()
-    
-    Change-Id: I520b38ed37b2d16d9a15f57b8e83b0b59c9a528c
-    Reviewed-on: https://code.wireshark.org/review/6666
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 0dcb91d
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Mon Jan 19 15:38:29 2015 -0500
-
-    synphasor: (trivial) Do dissector_add_uint("rtacser.data",...) only once
-    
-      and not each time prefs are changed.
-    
-      Also: do minor whitespace changes.
-    
-    Change-Id: I04bfc212e288473a78113e8b124ce4a13ad74ad1
-    Reviewed-on: https://code.wireshark.org/review/6663
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit 5fa13c6
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Mon Jan 19 15:32:45 2015 -0500
-
-    README.dissector: Minor update re date/time display.
-    
-    Change-Id: Iae467efeccd2e51ea66aab029100c958de7d374e
-    Reviewed-on: https://code.wireshark.org/review/6662
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit 7a81add
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Mon Jan 19 15:19:46 2015 -0500
-
-    synphasor: prevent possible crash; gmtime() can return NULL;
-    
-    Don't do manual conversion of a time-field to UTC using gmtime().
-    Use the standard Wireshark mechanisms.
-    
-    Change-Id: I2eaee074a590ecab492336bb6ad794bdd036f699
-    Reviewed-on: https://code.wireshark.org/review/6661
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit 7e1d73d
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Mon Jan 19 15:15:45 2015 -0500
-
-    dmp, gmhdr, vssmonitoring: prevent possible crashes;
-    
-    gmtime()/localtime() can return NULL.
-    
-    Change-Id: If0589261429ee15d0c07972a99d94f9fe83626f6
-    Reviewed-on: https://code.wireshark.org/review/6660
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit d1cace9
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Mon Jan 19 15:03:23 2015 -0500
-
-    smb-pipe: prevent possible crash; gmtime() can return NULL.
-    
-    For FT_ABSOLUTE_TIME fields:
-    
-    Instead of calling gmtime()/mktime() to convert a time to UTC time
-    which is then displayed using proto_tree_add_time(),
-    
-    Use ABSOLUTE_TIME_UTC as the 'display' value for the field and then
-    display the field using proto_tree_add_item().
-    
-    Change-Id: I1926c40de76a86072437902cb7621d3873827b11
-    Reviewed-on: https://code.wireshark.org/review/6659
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit b41065e
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jan 19 21:28:52 2015 +0100
-
-    BGP: EVPN - Route Type 4 - "Invalid length of IP Address" - "Expert Info" shows a false error
-    
-    Wrong offset (14 -> 20) to get IP Address Legnth
-    
-    Issue Reported by Rui
-    Bug: 10873
-    
-    Change-Id: Ib7aa80ac78028a2c8d548f4030278166be9ed0cc
-    Reviewed-on: https://code.wireshark.org/review/6657
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 9fd5078
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jan 19 21:28:04 2015 +0100
-
-    BGP: fix  field bgp.evpn.nlri.mpls_ls is not of type FT_STRING, FT_STRINGZ, or FT_STRINGZPAD
-    
-    Change-Id: Ida14611dee9eb01e1eab13a96c15ab3d759ed1cd
-    Reviewed-on: https://code.wireshark.org/review/6656
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit ab8a13d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jan 19 12:26:06 2015 -0800
-
-    Don't mix declarations and code - it's not legal C90.
-    
-    Change-Id: I1a89c729255560d596e4d7701468cca3e9000357
-    Reviewed-on: https://code.wireshark.org/review/6655
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit c0fd539
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Jan 19 20:50:12 2015 +0100
-
-    ZigBee: fix dissection of epoch time in OTA cluster
-    
-    Bug: 10872
-    Change-Id: I25275ecb76cc03774ab210fb33a3bef5b1982585
-    Reviewed-on: https://code.wireshark.org/review/6653
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit de4164f
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Mon Jan 19 15:24:47 2015 +0100
-
-    On my system NSIS installs in the path defined in environment variable
-    ProgramFiles(x86)=C:\Program Files (x86)
-    Add that to the locations where we look for it. I couldn't use
-    ProgramFiles(x86) as a constant so put the path verbatim.
-    
-    Change-Id: Ibad9d4e2544e5b3924e10c68f02e072b0012226f
-    Reviewed-on: https://code.wireshark.org/review/6651
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c8bca4f
-Author: Josip Medved <jmedved@jmedved.com>
-Date:   Mon Jan 19 00:33:22 2015 -0800
-
-    Updated company name from Nokia Siemens Networks to Nokia Solutions and Networks.
-    
-    Change-Id: I93782facc2e3f9ff6358cf617968fac30bac1f7a
-    Reviewed-on: https://code.wireshark.org/review/6647
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 1b5a965
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jan 19 09:46:36 2015 +0100
-
-    JSMN : fix typo (it will be fix make distcheck)
-    
-    Change-Id: I188be77b77a5a52b233d482d6d8ea8b97adc00db
-    Reviewed-on: https://code.wireshark.org/review/6649
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 48e90da
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jan 19 08:38:16 2015 +0100
-
-    Fix make dist on Ubuntu buildbot
-    
-    Change-Id: Id3a5ed08fb8b7c721f8eeabbba723a9de0d47b0f
-    Reviewed-on: https://code.wireshark.org/review/6648
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit f90a10a
-Author: Josef Baumgartner <josef.baumgartner@br-automation.com>
-Date:   Tue Oct 21 13:12:18 2014 +0200
-
-    epl: Rework POWERLINK (EPL) dissector
-    
-     With this patch we want to enable a better support of POWERLINK
-     as a protocol for people who have to perform network diagnostics using
-     analyzing tools. Up until now, the main tool used was Omnipeek.
-     Now wireshark will be used more and more, due to the new extcap
-     infrastructure, which supports debug tools to be added as capture
-     devices.
-    
-     To better facilitate that change, we have adapted the textual
-     representation of the Omnipeek dissector for POWERLINK, as it
-     allows for a faster and simpler diagnosis routine.
-    
-     Additionally the name of the protocol has been changed to it's
-     correct name "POWERLINK" as this is the official name used by
-     EPSG for describing the protocol.
-    
-    Changelog:
-     - Add error code definitions and string values.
-     - Change name for protocol column to POWERLINK which is more commonly
-       used than EPL.
-     - Reformat output in info column to look like output the output of
-       the POWERLINK plugin for Omnipeek. This facilitates the transition
-       to Wireshark. The added information and changed output improves the
-       debugging of POWERLINK nerworks.
-    
-    Change-Id: I795e2487f2ae7af6b90c29366a1843c9fabffa85
-    Reviewed-on: https://code.wireshark.org/review/5581
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit f53be88
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Jan 2 21:33:49 2015 +0100
-
-    JSON dissector changed into heuristic dissector.
-    
-    To check if a payload is json, the library libjsmn has been added to the source tree, with its licence (MIT).
-    TODO: the libjsmn can be used to extract tokens in the standard dissection other than heurisitic part.
-    
-    HPFEEDS dissector has also been changed in order to leverage the new json dissector.
-    
-    Bug: 10834
-    Change-Id: Ib1df2a699982dbdd2b5418e97edbdb5cbd9c8978
-    Reviewed-on: https://code.wireshark.org/review/6350
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 119416e
-Author: Luke Mewburn <luke@mewburn.net>
-Date:   Tue Dec 23 18:32:34 2014 +1100
-
-    TCAP: support dialogue confirmation
-    
-    TCAP permits the changing of the originating address on the first
-    backwards continue (i.e. the establishment of the dialogue).
-    See ITU-T Q.771 (06/97) clause 3.1.2.2.2.2 Confirmation of the dialogue.
-    In practice, a BEGIN replied to with an END can also exhibit this behaviour.
-    
-    For example, a BEGIN from GT A TID TA -> GT B,
-    and the reply CONTINUE from GT B2 TID TB -> GT A TID TA.
-    To support this, only support a single address hash in
-    tcaphash_begin_info_key_t and tcaphash_end_info_key_t.
-    The match of the first CONTINUE should find the appropriate
-    tcaphash_begin and create the appropriate tcaphash_end entries.
-    
-    Also fix compile warning with DEBUG_TCAPSRT.
-    
-    Bug: 10841
-    Change-Id: Ibe75e3940e757727357b20be10f9c195c5888fdd
-    Reviewed-on: https://code.wireshark.org/review/6446
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c4297e6
-Author: Diederik de Groot <ddegroot@talon.nl>
-Date:   Sun Jan 18 00:23:33 2015 +0100
-
-    Skinny: packet-skinny.c
-    Changes: Number of small changes to the xml file:
-       - some fields being connected to the wrong message version
-       - some header field naming
-    
-    Change-Id: I062c31777a4193de3d5c44b0ba733dd9d1702352
-    Reviewed-on: https://code.wireshark.org/review/6602
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 199cb06
-Author: Sergio Moreno Mozota <sergio.morenomozota@telefonica.com>
-Date:   Sat Jan 17 23:24:22 2015 -0500
-
-    RTP: Parse problem in dissect_rtp_hext_rfc5215_onebyte
-    
-    some commercial IPTV streamers send bogus info in the extension headers, add some sanity check to skip the erroneous bytes.
-    
-    Bug: 10513
-    Change-Id: I6f20073a00ed0f791fa99701534360d304060053
-    Reviewed-on: https://code.wireshark.org/review/6606
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e333e4c
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Jan 17 14:11:29 2015 -0500
-
-    Convert OID APIs to use wmem.
-    
-    There are a few oid functions that are only called in oids_test.c.  I'll presume the APIs are used in proprietary dissectors rather than just remove them.
-    
-    Change-Id: I4595e00f93bf9ab8cf2493fe0432b91960f55a3f
-    Reviewed-on: https://code.wireshark.org/review/6592
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 59155d1
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jan 18 17:48:53 2015 -0800
-
-    Eliminate ep_strdup(), as it's no longer used.
-    
-    Also, remove some no-longer-existent functions from checkAPIs.pl.
-    
-    Change-Id: I2bf11e3ec03a34f9e89d58d560e340d76fd3ddc1
-    Reviewed-on: https://code.wireshark.org/review/6645
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5162b7f
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Sun Jan 18 18:41:37 2015 -0500
-
-    smpp: Prevent crash if invalid date/time field.
-    
-      gmtime()/localtime() can return NULL;
-    
-    Bug 10868
-    Change-Id: I496bab62555c7741b3d159726e74a3d14c4b51cb
-    Reviewed-on: https://code.wireshark.org/review/6644
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit b2b640f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jan 18 15:48:22 2015 -0800
-
-    Reflect the disappearance of the seasonal allocator.
-    
-    Change-Id: I1c76bf9eed516aa9afbc04b1b9236a04b0b1988c
-    Reviewed-on: https://code.wireshark.org/review/6643
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 4cea624
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jan 18 15:46:23 2015 -0800
-
-    This currently requires emem.h.
-    
-    Change-Id: I55cca8de9be07fbec4e771c0f6d50075fc75bef8
-    Reviewed-on: https://code.wireshark.org/review/6642
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit ae92cd4
-Author: AndersBroman <a.broman@bredband.net>
-Date:   Sun Jan 18 16:38:35 2015 +0100
-
-    [Qt] Run windeployqt for Qt versions greater than 5.2
-    
-    Change-Id: I3c7e7ed35ffead280c1ac394a4ef8172a89fe3a6
-    Reviewed-on: https://code.wireshark.org/review/6622
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 5970223
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jan 18 14:16:55 2015 -0800
-
-    Put back ep_alloc0(), accidentally deleted in the removal of the se_ stuff.
-    
-    (The se_ stuff wasn't as contiguous as I thought.)
-    
-    Also fix some comments to no longer refer to #defines for se_ stuff.
-    
-    Change-Id: Ibc53e6f0f135bee9795f98550d5242e8e58afb16
-    Reviewed-on: https://code.wireshark.org/review/6641
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 820c795
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jan 18 13:30:21 2015 -0800
-
-    This file currently does need emem.h.
-    
-    Change-Id: I27e709470d92d4be32ae42a3f4672f2070eaf65e
-    Reviewed-on: https://code.wireshark.org/review/6639
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7940bbc
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jan 18 13:26:12 2015 -0800
-
-    Nobody uses se_ allocations, so remove the code for them.
-    
-    Don't check for se_ routines in checkAPIs; the failure to compile or
-    link will suffice to catch attempts to use them.
-    
-    Update comments in another test script to reflect the disappearance of
-    the session allocator.
-    
-    Change-Id: If50d953c7130f48b696bc2dd9d327bea2af49bd4
-    Reviewed-on: https://code.wireshark.org/review/6638
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit d2d4cf2
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jan 18 13:10:18 2015 -0800
-
-    Remove a couple more apparently-no-longer-necessary emem.h includes.
-    
-    Change-Id: I007a904613653b60a5b1a4fdc8261bc1480e41c6
-    Reviewed-on: https://code.wireshark.org/review/6637
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 050bc7d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jan 18 13:02:15 2015 -0800
-
-    Update some comments to reflect reality.
-    
-    Get rid of references to ep_ and se_ allocation in code that now uses
-    wmem allocation instead.
-    
-    Fix API documentation of conversation_table.h routines to reflect that
-    as well - some APIs changed to pass wmem scopes.
-    
-    Also, zbee_sec_key_hash() now takes the output buffer as an argument and
-    just returns it, and nobody actually uses the return value, so change it
-    to return void.
-    
-    Change-Id: Ife1ec675a9322fd0f0be306a9d639ec17aad1c7a
-    Reviewed-on: https://code.wireshark.org/review/6636
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 929d41c
-Author: Evan Huus <eapache@gmail.com>
-Date:   Sun Jan 18 12:15:26 2015 -0500
-
-    Replace the last THROW ep_ calls with wmem
-    
-    They (should) all be strictly within the context of dissection, so can just
-    become packet_scope.
-    
-    Change-Id: Iaaa733628132f3ee3f1597f3df956e44080734f6
-    Reviewed-on: https://code.wireshark.org/review/6631
-    Petri-Dish: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit 212eb17
-Author: Evan Huus <eapache@gmail.com>
-Date:   Sun Jan 18 12:08:39 2015 -0500
-
-    replace DISSECTOR_ASSERT ep strings with wmem
-    
-    the DISSECTOR_ASSERT macro and friends are all guaranteed to be called within
-    the scope of a dissection, so they are safe to replace with wmem_packet_scope.
-    
-    Change-Id: I2684fb902da78d50aca5f4644df66c060caff625
-    Reviewed-on: https://code.wireshark.org/review/6629
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit 44e7ce5
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jan 18 12:18:38 2015 -0800
-
-    Remove some apparently-unnecessary includes of emem.h.
-    
-    Change-Id: Ib7d1b587b439ff21ec6b7f1756ce6ccf25b66f80
-    Reviewed-on: https://code.wireshark.org/review/6635
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7abb103
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Jan 15 13:07:48 2015 -0800
-
-    CMake: Copy data files to the run directory.
-    
-    Set DATAFILE_DIR to a value that includes the build configuration. Add a
-    copy_data_files target that copies AUTHORS-SHORT, the default filters,
-    and other support files to the run directory. Add FindPowerShell.cmake
-    and require it on Windows. Remove some OS X BUNDLE_RESOURCE_
-    declarations which are now covered by copy_data_files.
-    
-    Change-Id: Iade74946dd5ed2c54239036aa4970f9ffc4681a4
-    Reviewed-on: https://code.wireshark.org/review/6561
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 24954d6
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Sun Jan 18 14:45:30 2015 -0500
-
-    proto.c: Update some comments to reflect reality
-    
-    Change-Id: I0f82666cb233688d94d6f3a2c45d7490a7f79bec
-    Reviewed-on: https://code.wireshark.org/review/6634
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit e601e01
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jan 18 11:46:28 2015 -0800
-
-    Remove some apparently-unnecessary includes of emem.h.
-    
-    Also update a comment to no longer speak of ep_ allocation, and add an
-    include of <glib.h> to ui/profile.c, which was formerly relying on the
-    include of emem.h to drag it in.
-    
-    Change-Id: I08926699ee96cf66672836b6ee3bbb405b507ce8
-    Reviewed-on: https://code.wireshark.org/review/6633
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 233dc64
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jan 18 11:33:27 2015 -0800
-
-    Remove some apparently-unnecessary includes of emem.h.
-    
-    Change-Id: Id50ce3e707056cca8f30052f05c451ce431b39b5
-    Reviewed-on: https://code.wireshark.org/review/6632
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 71c21a6
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Jan 16 12:35:14 2015 -0500
-
-    Remove seasonal memory from address resolution.
-    
-    This is the last remaining use of se_ memory APIs.
-    
-    Change-Id: Ic0508a830bc5460bc743d21eb33ffdd7f4ce2eb5
-    Reviewed-on: https://code.wireshark.org/review/6574
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 90fc37e
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Jan 18 18:08:07 2015 +0100
-
-    make things a bit easier to read...
-    
-    Change-Id: I3499c2f9e07a960f8bdf83973693bdeb4fb4ebd9
-    Reviewed-on: https://code.wireshark.org/review/6630
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 1722d2a
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Jan 18 17:28:16 2015 +0100
-
-    remove trans_info parameter from dissect_usb_hid_report_item()
-    
-    Change-Id: I04eba644be7dd3e64b67c7d42c596bcdcf6a1942
-    Reviewed-on: https://code.wireshark.org/review/6628
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 4399319
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Jan 18 17:16:15 2015 +0100
-
-    clean up the functions that dissect the hid requests
-    
-    Change-Id: Ie4d52b62824a8c0c777ffce3988fbe1fd4e5b4a4
-    Reviewed-on: https://code.wireshark.org/review/6627
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 9ba910f
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Jan 18 17:07:41 2015 +0100
-
-    remove redundant (and unused) paramter usb_trans_info
-    
-    Change-Id: Ibb683f6d42125b13417aceb06949102a9821d626
-    Reviewed-on: https://code.wireshark.org/review/6626
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 2441a23
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Jan 18 08:04:40 2015 -0800
-
-    [Automatic manuf, services and enterprise-numbers update for 2015-01-18]
-    
-    Change-Id: If1c72e3b58ced6b9b86a584d96f632b2433751e8
-    Reviewed-on: https://code.wireshark.org/review/6623
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 0d92b99
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Jan 18 15:20:57 2015 +0100
-
-    ISUP: add dissection of generic number qualifier indicator
-    
-    Bug: 10865
-    Change-Id: Ib4cd60f570250490d5417c692f487711a65536b1
-    Reviewed-on: https://code.wireshark.org/review/6620
-    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: Anders Broman <a.broman58@gmail.com>
-
-commit b01ef11
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Jan 18 15:35:29 2015 +0100
-
-    HTTP: revert a change done in g0ee179c
-    
-    As indicated in the comment above, the previous code was done on purpose to handle the NUL case
-    
-    Bug: 10866
-    Change-Id: I66eb9f6fbc9477456310978b420ba30975d81b0a
-    Reviewed-on: https://code.wireshark.org/review/6621
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 2660806
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Jan 18 13:51:00 2015 +0100
-
-    no need for if(tree)
-    
-    Change-Id: I7e8cfe3a220d65e80afa109a62867c4ff2ce08e8
-    Reviewed-on: https://code.wireshark.org/review/6619
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit c922801
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Jan 17 18:30:07 2015 -0500
-
-    ftype (integer): fix Uninitialized argument value found by Clang Analyzer
-    
-    Change-Id: I79e893f1d810a90c6a495067941d2e393e9fee72
-    Reviewed-on: https://code.wireshark.org/review/6501
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e7593ea
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Jan 18 13:13:00 2015 +0100
-
-    asn2wrs: autodetect if 64 bits variant is required for constrained integers
-    
-    It does not work with defines, but is already a great step forward
-    
-    Change-Id: I346d4124690ec46a2299d4eae8031bbb19a3db8e
-    Reviewed-on: https://code.wireshark.org/review/6617
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 12d17d2
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Jan 18 13:35:20 2015 +0100
-
-    Update libwireshark0.symbols
-    
-    Change-Id: I694448a998d3a1b74b19d2f1dfd6bb2be5bbce39
-    Reviewed-on: https://code.wireshark.org/review/6616
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit c326fca
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Jan 18 12:22:22 2015 +0100
-
-    LDAP: g8c608e6 did not include the changes in template file, that got lost afterwards
-    
-    Change-Id: I5d79d3e48c1ad83713a312dce39b749f47b0ecc8
-    Reviewed-on: https://code.wireshark.org/review/6612
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 13b1e90
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Jan 18 11:58:02 2015 +0100
-
-    ASN.1: regenerate dissectors after g506409d
-    
-    Change-Id: If82112ce7bae4de0c0c24794dc57ffebbf401978
-    Reviewed-on: https://code.wireshark.org/review/6611
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit ebea11a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jan 18 02:46:49 2015 -0800
-
-    We need epan/wmem/wmem.h regardless of whether we have GeoIP.
-    
-    It's used to generate the "sorry, we don't have GeoIP" message.
-    
-    Change-Id: Ibd4e15508d3e2d09d81951b4dc23a1264971bb7a
-    Reviewed-on: https://code.wireshark.org/review/6610
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit c7500dd
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jan 18 02:43:54 2015 -0800
-
-    Fix another dfilter_compile() call.
-    
-    Change-Id: I8b035a09b1bc1981a78a80e0a2547dce65a2ac9c
-    Reviewed-on: https://code.wireshark.org/review/6609
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit cfcbb28
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jan 18 02:22:19 2015 -0800
-
-    Clean up ftype-conversion and dfilter error message string handling.
-    
-    Have dfilter_compile() take an additional gchar ** argument, pointing to
-    a gchar * item that, on error, gets set to point to a g_malloc()ed error
-    string.  That removes one bit of global state from the display filter
-    parser, and doesn't impose a fixed limit on the error message strings.
-    
-    Have fvalue_from_string() and fvalue_from_unparsed() take a gchar **
-    argument, pointer to a gchar * item, rather than an error-reporting
-    function, and set the gchar * item to point to a g_malloc()ed error
-    string on an error.
-    
-    Allow either gchar ** argument to be null; if the argument is null, no
-    error message is allocated or provided.
-    
-    Change-Id: Ibd36b8aaa9bf4234aa6efa1e7fb95f7037493b4c
-    Reviewed-on: https://code.wireshark.org/review/6608
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit c60fb30
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Jan 18 10:23:10 2015 +0100
-
-    Try to make Mac OS X Buildbots happy
-    
-    fix return makes pointer from integer without a cast
-    
-    Change-Id: Iaa55de58c36b1a59b08946836e519fee7bb889fc
-    Reviewed-on: https://code.wireshark.org/review/6607
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit a1f2342
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Jan 17 21:17:24 2015 -0500
-
-    Miscellaneous ep_strdup_printf replacement.
-    
-    Change-Id: I973c672e9d573ad67e9b9fd82a5610aaf8a74efa
-    Reviewed-on: https://code.wireshark.org/review/6605
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ef7e8aa
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Jan 17 20:59:20 2015 -0500
-
-    Remove ep_strndup
-    
-    Change-Id: Id336dc16f97a0973754993094aa637813c0ca31c
-    Reviewed-on: https://code.wireshark.org/review/6604
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 403be72
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Jan 17 20:34:35 2015 -0500
-
-    Remove emem from GeoIP
-    
-    Change-Id: Ifa96dc38a277b86c28f762489251dcc595afae67
-    Reviewed-on: https://code.wireshark.org/review/6603
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 86726f4
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Jan 16 23:11:49 2015 -0500
-
-    Trim down the use of ep_ memory in the display filter code.
-    
-    Couldn't quite eliminate it completely, but it's much improved.  Need to figure out where/when to free dfilter_error_msg.
-    
-    Change-Id: I10216e9546d38e83f69991ded8ec0b3fc8472035
-    Reviewed-on: https://code.wireshark.org/review/6591
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 0ad15f8
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Jan 17 16:55:46 2015 -0500
-
-    Replace the last of ep_alloc and ep_alloc0 with wmem equivalent.
-    
-    Change-Id: I0338d0acda5e4b9957aad4825ca2cfd6fa506ead
-    Reviewed-on: https://code.wireshark.org/review/6596
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b5eb971
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Jan 17 16:30:25 2015 -0500
-
-    Replace all remaining instances of ep_new with wmem_new and wmem_packet_scope.
-    
-    Change-Id: I50b2cd0e233554bc58082e96e8d879b40edfc0c1
-    Reviewed-on: https://code.wireshark.org/review/6595
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit be113e8
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jan 12 20:04:32 2015 +0100
-
-    DHCP/BOOTP: Option 125 Suboption: (1) option-len always expects 1 but specification allows for more
-    
-    We believe this is a bug in Wireshark with Option 125 Suboption: (1)  option-len where Wireshark always expects 1 but specification is more flexible.
-    Re: http://www.cablelabs.com/wp-content/uploads/specdocs/CL-SP-CANN-DHCP-Reg-I10-1308081.pdf page 15 part 4.2.2 'The DHCPv4 Option Request Option'
-    
-    Issue reported by Steve Krebs
-    
-    Bug:10784
-    Change-Id: I8eced7a70877d13d925b81c0f47885609baa7633
-    Reviewed-on: https://code.wireshark.org/review/6510
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 506409d
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Jan 17 22:43:46 2015 +0100
-
-    X509AF: dissect Certificate Serial Number as INT64 instead of INT32
-    
-    Bug: 10862
-    Change-Id: Ie315298dd090b3b689f6a9bfff6f6f5bf7cc715a
-    Reviewed-on: https://code.wireshark.org/review/6594
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 77dac91
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Jan 16 23:18:46 2015 -0500
-
-    A few more emem replacements with wmem.
-    
-    Change-Id: Icfb319fba937642db637a7f26b5e7627461df3b0
-    Reviewed-on: https://code.wireshark.org/review/6590
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5c5b3f7
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Jan 16 21:47:48 2015 -0500
-
-    Convert proto_construct_match_selected_string to use wmem.
-    
-    Change-Id: I7a40c0996517aa71b4ddb764ce3a6e92a55260ad
-    Reviewed-on: https://code.wireshark.org/review/6589
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6010d99
-Author: Sebastian Kloeppel <sk@nakedape.net>
-Date:   Thu Jan 15 11:19:41 2015 +0100
-
-    Added Card Application Toolkit Transport Protocol (CATTP) dissector
-    
-    Bug: 10843
-    Change-Id: I35350d98b4225be12875b16e67506f7385ea9f28
-    Reviewed-on: https://code.wireshark.org/review/6111
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit ffa8bdd
-Author: Russel <russel@appliedinvention.com>
-Date:   Fri Jan 16 14:27:10 2015 -0800
-
-    Correct PF field offset when looking for DA
-    
-    Previous code was not shifting far enough, was checking PS instead
-    of PF.
-    
-    Change-Id: Ic0bdbb4dfaa7bdd708a49f1fb67706dd949f2607
-    Reviewed-on: https://code.wireshark.org/review/6578
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8ec6ac6
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Jan 11 11:57:42 2015 +0100
-
-    dissect CCRC, APRC and the APDU body's data
-    
-    Change-Id: I21f7420286ed3e668ce4dc0eac06bbf4172039d6
-    Reviewed-on: https://code.wireshark.org/review/6588
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 21e40ea
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Jan 10 18:33:32 2015 +0100
-
-    dissect the serial characters and the CRC
-    
-    Change-Id: I64af822f30b02d313f5242014ff5e40a73dffa35
-    Reviewed-on: https://code.wireshark.org/review/6587
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit a38b714
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Jan 17 14:55:22 2015 +0100
-
-    RSYNC: Malformed Packet on rsync-version with length 2
-    
-    RSYNC dissector always think the resync-version length = 4
-    
-    Bug:10863
-    Change-Id: I2dee3ff7195af110223903d79b938849666878a7
-    Reviewed-on: https://code.wireshark.org/review/6584
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit aa1057d
-Author: maisheri <maisheri.hitesh@gmail.com>
-Date:   Sat Jan 17 14:05:38 2015 +0530
-
-    EAPOL-MKA: Included fixes for the distributed sak handling.
-    
-    Change-Id: Id91ba408266f18a9336811bf9d8b875796ea0cc1
-    Reviewed-on: https://code.wireshark.org/review/6582
-    Reviewed-by: maisheri <maisheri.hitesh@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 62ea319
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jan 16 18:59:12 2015 -0800
-
-    PacketLogger files can be big-endian or little-endian.
-    
-    Bug: 10861
-    Change-Id: Iedb248aa4a96e65bb525ba6475dc767e5dfefbe0
-    Reviewed-on: https://code.wireshark.org/review/6579
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 3f284fb
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Jan 15 22:41:13 2015 +0100
-
-    USB: do not put usb_address_t structure on stack and initialize it completely (including implicit padding for alignment)
-    
-    Bug: 10857
-    Change-Id: Ib8339a5dc1c9461e681e0015c3f851c642f300c9
-    Reviewed-on: https://code.wireshark.org/review/6560
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 1e8c6ee
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Jan 16 22:28:13 2015 +0100
-
-    Update a comment
-    
-    Change-Id: I7bf1173bfb23e5f083b8aaf09476b30b4791aae0
-    Reviewed-on: https://code.wireshark.org/review/6577
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit fa54781
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jan 16 11:26:20 2015 -0800
-
-    Update comment to reflect the current reality.
-    
-    Change-Id: I7f8c66723efc9d21ec3abc08e57db1df5f772f04
-    Reviewed-on: https://code.wireshark.org/review/6576
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 23666ba
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jan 16 10:40:26 2015 -0800
-
-    Spaces separate bytes; they don't have to surround them.
-    
-    I.e., you don't need a trailing blank, at least not with the current
-    version (and there shouldn't be a requirement for such an extra trailing
-    blank).
-    
-    Change-Id: Ia2b732c74fc6020acc01a2c0c52ed3567d36d762
-    Reviewed-on: https://code.wireshark.org/review/6575
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit b6ec25f
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Jan 16 18:05:15 2015 +0100
-
-    IS-IS: Add missing i variable for subclv loop (IS Reachability)
-    
-    Issue found by Alexander Okonnikov
-    
-    Change-Id: I4eacab63a685b84c0d75811b96dc452471244337
-    Reviewed-on: https://code.wireshark.org/review/6573
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit 22543d3
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Jan 16 18:03:03 2015 +0100
-
-    IS-IS: wrong length for SubTLV 18 (TE default Metric)
-    
-    Issue found by Alexander Okonnikov
-    
-    Change-Id: I8c1da71183f5bba50bb0bb541c259d5dba0b067d
-    Reviewed-on: https://code.wireshark.org/review/6572
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit 3f57512
-Author: Evan Huus <eapache@gmail.com>
-Date:   Fri Jan 16 11:09:51 2015 -0500
-
-    Kill more unused emem functions
-    
-    Change-Id: Ib81410b6d760886f2ae585f44ac58fc135da62c7
-    Reviewed-on: https://code.wireshark.org/review/6568
-    Petri-Dish: Evan Huus <eapache@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit 4fa7396
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Jan 15 12:45:02 2015 +0100
-
-    CMakeList.txt/Makefile.am (root) : fix indent (use tabs)
-    
-    Makefile.am: avoid double space
-    CMakeList.txt: Add modelines info
-    
-    Change-Id: Ic27d16b2f502362509ab13158e5428208afe3925
-    Reviewed-on: https://code.wireshark.org/review/6570
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 16d367f
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Jan 16 17:09:51 2015 +0100
-
-    ZBee ZCL: use tvb_get_guint8() (avoid tvb_get_ptr... !)
-    
-    Change-Id: I248ddb1dee5398528279807968b095cbc5413ae0
-    Reviewed-on: https://code.wireshark.org/review/6569
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 531df02
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Jan 16 08:15:41 2015 -0500
-
-    Remove se_ alloced memory from packet_list_store
-    
-    Change-Id: I7aa2f5f8b433468ad2c2cd73cfce986d128a9ae0
-    Reviewed-on: https://code.wireshark.org/review/6565
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 0235775
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Jan 16 14:59:54 2015 +0100
-
-    GSM SIM: enhance dissection of APDU Class byte
-    
-    Change-Id: I2089ff665a92ce16a0af100e2515463c92c6d057
-    Reviewed-on: https://code.wireshark.org/review/6567
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit ada1eec
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Jan 11 21:32:53 2015 -0500
-
-    SE_COPY_ADDRESS -> WMEM_COPY_ADDRESS
-    
-    Copy addresses with wmem-scope instead of (forced) seasonal scope.  All existing instances were converted to wmem_file_scope, but the flexibility is there for other scopes.
-    
-    Change-Id: I8e58837b9ef574ec7dd87e278470d7063ae8c1c2
-    Reviewed-on: https://code.wireshark.org/review/6564
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 260b19e
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Jan 16 08:29:57 2015 -0500
-
-    Remove seasonal memory from everything except address resolutions
-    
-    This includes circuits, conversations and streams as well as camel and h225 dissectors.
-    
-    Change-Id: Ia5ee70a5e5c6bcb420f0f19df126595246a3c042
-    Reviewed-on: https://code.wireshark.org/review/6566
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b2c4586
-Author: Chris Brandson <chris.brandson@gmail.com>
-Date:   Thu Jan 15 19:20:08 2015 -0800
-
-    bug 10833 undecoded bitmaps were being displayed raw which is hard to interpret, changed to an more friendly format
-    
-    Change-Id: If79a695646837cdfb3e1b168a47b96984c58e328
-    Reviewed-on: https://code.wireshark.org/review/6563
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a4d1709
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Thu Jan 15 21:46:52 2015 -0500
-
-    (Trivial) Move a comment next to the code related to it.
-    
-    Change-Id: I83749a1b30059cc8e8f13b58fbde74e9ab873582
-    Reviewed-on: https://code.wireshark.org/review/6562
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-
-commit d009b55
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Jan 15 19:48:39 2015 +0100
-
-    Quakeworld: Nesting level does not match indendation (CID 1159218)
-    
-    Change-Id: I6d18f103bda6db025eebfc902453256b007dddf7
-    Reviewed-on: https://code.wireshark.org/review/6556
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3f8fbb7
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Jan 11 21:18:22 2015 -0500
-
-    Remove the last two true calls to se_alloc.
-    
-    (The other calls are just wrapped in macros)
-    
-    Change-Id: I6a029dddf7742ba95510ec24cec30553461e48c6
-    Reviewed-on: https://code.wireshark.org/review/6558
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e530c89
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Jan 11 19:48:54 2015 -0500
-
-    Replace se alloced memory in compare stat tap.
-    
-    Also replaced comments mentioning se_alloc memory with wmem_file_scope, since it's more accurate.
-    
-    It seems that many of the TShark stat taps may be leaking memory, because the hash tables created by the taps don't get a chance to be freed.  Somewhat academic since TShark exits shortly after displaying any stats, but a leak none the less.
-    
-    Change-Id: I8ceecbd00d65b3442dc02d720b39c2e15aa0c8a6
-    Reviewed-on: https://code.wireshark.org/review/6557
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 7d43836
-Author: Deon van der Westhuysen <deonvdw@gmail.com>
-Date:   Tue Jan 6 10:22:48 2015 +0100
-
-    QT: stats_tree plug-ins not added to statistics menu
-    
-    Wireshark Qt does not add plug-ins that register with stats_tree_register_plugin() to the statistics menu in the ui (like the gtk version does).
-    
-    This patch dynamically adds all registered stats_tree plug-ins to the statistics menu.
-    
-    Bug: 9528
-    Change-Id: I99f9415502ca9f7121d494c856861edc1a762079
-    Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/6336
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit d5ee022
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Jan 15 15:09:47 2015 -0500
-
-    Replace C++ style comment with C style.
-    
-    Change-Id: Ibee0dccdb5a330866dcd0047216cd5a4da45fc8b
-    Reviewed-on: https://code.wireshark.org/review/6559
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c610c38
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Jan 15 19:46:11 2015 +0100
-
-    Conversation Table : Copy-paste error (CID 1262415)
-    
-    Change-Id: I37fd8154f93763ac091528921d1b66d8e8fd56dd
-    Reviewed-on: https://code.wireshark.org/review/6555
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e75dd98
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Jan 15 19:45:10 2015 +0100
-
-    NetFlow: Assign instead of compare (CID 1262419 & 1262420)
-    
-    Change-Id: Idc2c2e02b973f65c6c2f22f2d1bfd8545cd23f63
-    Reviewed-on: https://code.wireshark.org/review/6554
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-
-commit 1562827
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Jan 15 19:38:25 2015 +0100
-
-    Packet List (Qt): Missing break in switch (CID 1262418)
-    
-    Change-Id: Id46f2be5b5206dfcb0ce7e7ea2d31398eff54917
-    Reviewed-on: https://code.wireshark.org/review/6552
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 3385984
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Jan 15 19:43:11 2015 +0100
-
-    Address to str: Missing break in switch (CID 1262416 & 1262417)
-    
-    It will also fix "Unused Value" (CID 1262422)
-    
-    Change-Id: I626c087365e9d6fe625f807ab8ded518d94cab64
-    Reviewed-on: https://code.wireshark.org/review/6553
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit adf0881
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Jan 15 19:26:52 2015 +0100
-
-    HTTP: fix implicit conversion shortens 64-bit value into a 32-bit value
-    
-    It will be make Mac OS X buildbot happy
-    
-    Change-Id: I628445c1358675a58cc2d26ce1ca3007dd619ff3
-    Reviewed-on: https://code.wireshark.org/review/6551
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 9c044e2
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Jan 15 14:25:24 2015 +0100
-
-    ZigBee: packet scope memory cannot be used for BASE_CUSTOM callbacks
-    
-    Change-Id: I28fe21151b9f8c91786ca6c56d141a458419c501
-    Reviewed-on: https://code.wireshark.org/review/6548
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 69d32a9
-Author: Uli Heilmeier <uh@heilmeier.eu>
-Date:   Mon Jan 12 16:26:39 2015 +0100
-
-    HTTP Dissector: Add CitrixAGBasic authentication
-    
-    Citrix uses a proprietary authentication schema called CitrixAGBasic for
-    their StoreFront/Web Interface product.
-    
-    The Header looks like:
-    Authorization: CitrixAGBasic username="dGVzdHVzZXI="; domain= \
-           "dGVzdGRvbWFpbg=="; password="c2VjcmV0"; AGESessionId= \
-           "YzI0NmRkMmFmYmE5ZTk5M2I5ZDRkN2UwYzYzZWExN2U="
-    
-    This patch enhances the HTTP dissector to decode this authentication data.
-    
-    Due to non-discolsure I can only provide a faked GET request as a pcap
-    capture (attached to this bug).
-    
-    Bug: 10851
-    Change-Id: Ic8e48db94809c9c64889cd050911de3fe23cdcdd
-    Reviewed-on: https://code.wireshark.org/review/6526
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e0539ed
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Jan 15 08:34:52 2015 -0800
-
-    CMake: Rename the windeployqt variable.
-    
-    The windeployqt variable name ends up in the cache. Change it to
-    QT_WINDEPLOYQT_EXECUTABLE, which follows conventions used in the Qt
-    CMake modules.
-    
-    Change-Id: I14998b921009e44e5ca743e2915fe84447b22df0
-    Reviewed-on: https://code.wireshark.org/review/6549
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 58bb07b
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Wed Jan 14 22:59:21 2015 +0000
-
-    Fix-copy-qt-dll
-    
-    The copy-qt-dll custom command should ensure the qt bin dir is on
-    the path.
-    Modify the flags passed to windeployqt depending on the configuration.
-    
-    Change-Id: I12860d415f80cee323c72aa8a4892eaa6126f165
-    Reviewed-on: https://code.wireshark.org/review/6537
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit a1fce22
-Author: Martin Kaiser <martin.kaiser@paytec.ch>
-Date:   Thu Jan 15 16:18:23 2015 +0100
-
-    remove the executable bits from packet-zvt.c
-    
-    (I should not use git on cygwin for adding new files)
-    
-    Change-Id: I314d78073f1ebd633a20ff7c9ac3d0b236b3906a
-    Reviewed-on: https://code.wireshark.org/review/6547
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit ba7aa19
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Wed Dec 24 12:42:16 2014 +0100
-
-    start a dissector for ZVT Kassenschnittstelle
-    
-    this is a protocol between payment terminals and
-    electronic cash-register systems / vending machines
-    
-    Change-Id: Ieac87c0af8e15f2dfe8b4a6274f3b56d652a5b1f
-    Reviewed-on: https://code.wireshark.org/review/6531
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 1e1d96f
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Jan 15 16:01:40 2015 +0100
-
-    Modify the errorcode defenition to suit ANSI MAP, this is (probably) OK as
-    ANSI MAP is currently the only user of ANSI TCAP.
-    Bug: 6112
-    
-    Change-Id: I49f89c862ddc8351091a9a939415e4ba6e7603f5
-    Reviewed-on: https://code.wireshark.org/review/6546
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ef0435b
-Author: Evan Huus <eapache@gmail.com>
-Date:   Thu Jan 15 08:31:26 2015 -0500
-
-    ZigBee: don't use packet_scope outside of dissection
-    
-    The decode_* functions defined here are called post-dissection for formatting
-    labels, so don't have access to packet scope. Just use and free manual memory.
-    
-    Introduced in gbdfabe59.
-    
-    Bug: 10855
-    Change-Id: I9b0085b1f7779ae6fbd12482c44d8f611cdbb49f
-    Reviewed-on: https://code.wireshark.org/review/6545
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit c2350a5
-Author: Evan Huus <eapache@gmail.com>
-Date:   Thu Jan 15 05:42:06 2015 -0500
-
-    rsvp: fix typo
-    
-    caught by test suite as:
-    Duplicate field detected in call to proto_register_field_array:
-    rsvp.call_attributes is already registered
-    
-    Change-Id: Ibf4ead3026b9930fb8f6ab07f0a5a4c299cedc35
-    Reviewed-on: https://code.wireshark.org/review/6544
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit 0d9248e
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Thu Jan 15 09:41:32 2015 +0000
-
-    Netflow: Fix spelling of 'latitude'
-    
-    Change-Id: Iaae40f4a191e458645263c8d7a114392cd063707
-    Reviewed-on: https://code.wireshark.org/review/6543
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-
-commit adaa661
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Jan 7 21:32:47 2015 +0100
-
-    Update to libnghttp2 0.7.1
-    
-    Change-Id: Ib8d40586a3b95674447819f77eaaa69376dce6fd
-    Reviewed-on: https://code.wireshark.org/review/6411
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 5b92ab9
-Author: Miltos Patsiouras <mipatsio@gmail.com>
-Date:   Sat Nov 15 15:33:25 2014 +0200
-
-    RSVP: Add support of GMPLS Support for Metro Ethernet Forum and G.8011 (RFC 6004)
-    
-       This document describes a method for controlling two specific types
-       of Ethernet switching via Generalized Multi-Protocol Label Switching
-       (GMPLS).  This document supports the types of switching corresponding
-       to the Ethernet services that have been defined in the context of the
-       Metro Ethernet Forum (MEF) and International Telecommunication Union
-       (ITU) G.8011.  Specifically, switching in support of Ethernet private
-       line and Ethernet virtual private line services are covered.  Support
-       for MEF- and ITU-defined parameters is also cover
-    
-    Bug: 7841
-    Change-Id: I12e12d01d497bd0e9703efcf6bd8ad100805bccc
-    Change-Id: I180c095652604bc025ab81171dd8a042e0930f08
-    Reviewed-on: https://code.wireshark.org/review/5323
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 06ddb7e
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Jan 13 11:45:15 2015 +0100
-
-    CAPWAP: Add a IEE802.11 Message Element Type (RFC5416)
-    
-    * IEEE 802.11 Information Element (1029)
-    
-    Add add_tagged_field to packet-ieee80211.h (will be used by other dissector)
-    
-    Change-Id: Icd13be416ccc47fb2309b9962e9a47c339885d1e
-    Reviewed-on: https://code.wireshark.org/review/6524
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit fcd2d4f
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Wed Jan 14 23:05:02 2015 +0000
-
-    Fix cmake-cflags
-    
-    The flags that are deleted are already supplied by the CMake generator.
-    
-    Change-Id: Ifafc2343ac0c5d365a39f4a181b23f54c65bce74
-    Reviewed-on: https://code.wireshark.org/review/6538
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-
-commit cb1f8a3
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jan 12 18:14:00 2015 +0100
-
-    CAPWAP: Add some IEE802.11 Message Element Type (RFC5416)
-    
-    * IEEE 802.11 OFDM Control (1033)
-    * IEEE 802.11 Update WLAN (1044)
-    
-    Change-Id: I702de1d649b1dc2af1de83ee21152c6a18f42dfc
-    Reviewed-on: https://code.wireshark.org/review/6509
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit f6021e8
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jan 12 17:13:28 2015 +0100
-
-    CAPWAP: Add a new Message Element Type (RFC5415)
-    
-    * Delete Station (18)
-    
-    Change-Id: I33afa96d183b8ff22725d2e00dcfeccea3fdfa04
-    Reviewed-on: https://code.wireshark.org/review/6508
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d9ec8ab
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Jan 4 13:16:47 2015 +0100
-
-    mate_util: fix parameter ... not found in the function declaration [-Wdocumentation]
-    
-    Change-Id: I66af53ee06866b45339814b5fa949551c0dd45c1
-    Reviewed-on: https://code.wireshark.org/review/6535
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 6f630c1
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Wed Jan 14 21:04:32 2015 -0500
-
-    Fix the compile: Use the new (double) variable.
-    
-    Change-Id: I38a9b0f55e9f19fe7f4f09f5eec2817dd822c6d0
-    Reviewed-on: https://code.wireshark.org/review/6542
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-
-commit b63a942
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Jan 14 16:55:40 2015 -0800
-
-    Fix a crash in the GTK+ RTP Streams dialog.
-    
-    Make sure we copy guint, gdouble, and gchar * data to variables of the
-    correct type. Fixes a crash when trying to copy CSV data (we were trying
-    to stuff a gdouble into a char *).
-    
-    Change-Id: I3cbcc48216a078f85f13860d14707f309b9820d7
-    Reviewed-on: https://code.wireshark.org/review/6541
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit d443db0
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Jan 14 16:41:38 2015 -0800
-
-    Fix indentation.
-    
-    Change-Id: I089d18d6dde56c04d75f7c991511728a0a66f699
-    Reviewed-on: https://code.wireshark.org/review/6540
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 9a19d6d
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Jan 14 15:13:40 2015 -0800
-
-    CMake: Look for FOP and HHC only when needed.
-    
-    FOP is only required for generating PDF output and HHC is only needed
-    for CHM output. Don't look for them unconditionally.
-    
-    Change-Id: I7bec7d061c9e9e8b99431cab873e8c719469552c
-    Reviewed-on: https://code.wireshark.org/review/6539
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 242f711
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Jan 13 13:32:12 2015 -0800
-
-    CMake: Update windeployqt discovery.
-    
-    Update the comments and add a URL. Use HINTS, which is more correct
-    according to the documentation.
-    
-    Change-Id: I82a7e2790dfa0b398e2b534f9f45851f55bdc0d2
-    Reviewed-on: https://code.wireshark.org/review/6536
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 5b8fa72
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Jan 13 13:32:12 2015 -0800
-
-    CMake: Copy Qt DLLs to the target directory.
-    
-    Add a "copy_qt_dlls" target similar to "copy_cli_dlls". Wireshark.exe
-    must exist before windeployqt can be run, so we can't create a PRE_BUILD
-    target. Add copy_qt_dlls to the default target instead.
-    
-    Change-Id: If85d89478472b10b31229413465955fe98b0ef02
-    Reviewed-on: https://code.wireshark.org/review/6529
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 86fde78
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Jan 13 10:15:18 2015 -0800
-
-    CMake: Copy wireshark-gtk dependent DLLs to the target directory.
-    
-    Add a "copy_gtk_dlls" target similar to "copy_cli_dlls".
-    
-    Change-Id: Id1df1d0ec00c46fccec90c4b8c0c8a2d2a14766a
-    Reviewed-on: https://code.wireshark.org/review/6527
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 20e2c05
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Jan 14 13:47:08 2015 +0100
-
-    [E212]Modify dissect_e212_mcc_mnc() to take E212 number type as an
-    argument. While at it remove deprecated APIs
-    
-    Change-Id: Ib1a7e9d7aeba6379fb4492816a0ac602e67493c6
-    Reviewed-on: https://code.wireshark.org/review/6534
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 36aca29
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Mon Jan 12 15:12:04 2015 +0000
-
-    Minor Development Guide updates
-    
-    Corrected info about paths to built executable.
-    Cross referenced empty debugger sections to the section with info.
-    
-    Change-Id: I4366825990f1a5286c7292c9f00e540160c1b5d0
-    Reviewed-on: https://code.wireshark.org/review/6520
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-
-commit 0ee179c
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Jan 13 23:18:37 2015 +0100
-
-    HTTP: allocate header_name in packet scope instead of file scope
-    
-    While we are at it, factorize the copy of value string
-    
-    Change-Id: I2a16155641b8bd8623baf51f787a5f450e7b3803
-    Reviewed-on: https://code.wireshark.org/review/6530
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 63a3d04
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jan 13 15:13:40 2015 -0800
-
-    Consistently use the "g_string_free returns a C string pointer" idiom.
-    
-    g_string_free(str, FALSE) frees the GString container but not the
-    underlying g_malloc()ed string; instead, it returns a pointer to the
-    g_malloc()ed string.
-    
-    Fix those places that didn't already get the string pointer from
-    g_string_free() to do so rather than manually extracting the string
-    themselves.
-    
-    And fix one place that didn't even need to use a string - it was just
-    scanning a C string without even modifying it.
-    
-    Change-Id: Ibbf4872bf5b9935b9907f539b6edb1013f3053a5
-    Reviewed-on: https://code.wireshark.org/review/6532
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 9f5e4fb
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jan 13 13:00:59 2015 -0800
-
-    uat_load() and uat_save() return a success indication; use it.
-    
-    Instead of always ignoring the return value, always check it, and only
-    report an error if it returns FALSE.
-    
-    (Alternative: have it return NULL on success and a pointer to a
-    g_malloc()ed string on failure.)
-    
-    Fix a comment while we're at it.
-    
-    Change-Id: Icb72c9f47775b6552e3eb4fe5ddcc85482bfb5fb
-    Reviewed-on: https://code.wireshark.org/review/6528
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 25f010b
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Jan 13 14:26:34 2015 +0100
-
-    MAC LTE: upgrade dissector to v12.4.0
-    
-    Change-Id: Ieb5395a6ae7a1d7625fe645d0caf14008993d3d9
-    Reviewed-on: https://code.wireshark.org/review/6521
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit bc23f79
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jan 13 12:13:45 2015 -0800
-
-    UAT error string pointers should not be const pointers.
-    
-    UAT error strings are usually allocated by g_strdup() or
-    g_strdup_printf(), and must ultimately be freed by the caller.
-    
-    Make the pointer-to-error-string-pointer arguments to various functions
-    be "char **", not "const char **".
-    
-    Fix cases that finds where a raw string was being used, as that won't
-    work if you try to free it; g_strdup() it instead.
-    
-    Add a missing free of an error string.
-    
-    Remove some no-longer-necessary casts.
-    
-    Remove some unnecessary g_strdup()s (the string being handed to it was
-    already g_malloc()ated).
-    
-    Change some variable declarations to match.
-    
-    Put in XXX comments for some cases where the error string is just freed,
-    without being shown to the user.
-    
-    Change-Id: I40297746a2ef729c56763baeddbb0842386fa0d0
-    Reviewed-on: https://code.wireshark.org/review/6525
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit a988253
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Jan 12 14:44:42 2015 -0800
-
-    CMake: Copy libwireshark dependent DLLs to the target directory.
-    
-    Add a "copy_cli_dlls" target which copies the DLLs required to run our
-    command line programs to the run directory.
-    
-    Fix the spelling of "KERBEROS". Start filling in variables so that we
-    can populate config.nsh.
-    
-    Change-Id: I9b3ed912dfbffecbf09f2893efa2c9d82e709521
-    Reviewed-on: https://code.wireshark.org/review/6513
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 42e4040
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Jan 13 15:12:45 2015 +0100
-
-    [GPRS CDR]Fix faulty ASN1 modification
-    Should be: egsnPDPRecord                   [70] EGSNPDPRecordV750
-    
-    Change-Id: I4b03524c09b6ce603cf4783144d588c8839a16e6
-    Reviewed-on: https://code.wireshark.org/review/6523
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit db7f25f
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Jan 13 14:04:44 2015 +0100
-
-    [GPRS CDR] Handle Rel 7 CDRs
-    
-    Change-Id: I09833a326e486273c3eacaceba0963fe88e0dac6
-    Reviewed-on: https://code.wireshark.org/review/6522
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit f90eeb1
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jan 12 20:35:44 2015 -0800
-
-    When allocating address structures, use wmem_new0().
-    
-    For structures used as the data in an address, use wmem_new(), so that
-    structure padding is zeroed out; the comparison code for addresses
-    compares all bytes of the structure for addresses that are structures,
-    and the hashing code for hash tables using addresses as keys hash all
-    the bytes, so we have to make sure that, for addresses that are the
-    same, *all* bytes are the same.
-    
-    Change-Id: I995fd26cc2f20edb5a599f95562b720561708e57
-    Reviewed-on: https://code.wireshark.org/review/6517
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit b204ff4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jan 12 20:07:09 2015 -0800
-
-    Do bounds checking when decompressing WCP packets.
-    
-    Extract the data offset and count only once, and make sure we don't run
-    past the end of the data we've copied from the packet; have
-    decompressed_entry() just do the decompression, rather than also
-    fetching the data offset and count.
-    
-    Add some comments while we're at it.
-    
-    Bug: 10844
-    Change-Id: I2dc2f9594422ffa8f15fd5c57c9dac2e30e363f4
-    Reviewed-on: https://code.wireshark.org/review/6514
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 63d8e44
-Author: Jörg Mayer <jmayer@egg.fg-networking.de>
-Date:   Tue Jan 13 02:35:37 2015 +0100
-
-    Fix ASCIIDOC detection broken by commit ae2888aeb2b418c9f62
-    
-    Change-Id: I36cd42a9040e8f8ab2b11ff4211a1298663909a2
-    Reviewed-on: https://code.wireshark.org/review/6512
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit de5e7b8
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Jan 12 11:24:37 2015 -0500
-
-    Fix casting compiler warning
-    
-    Change-Id: I179706042168cb4fd1bfb5f9c573f302d9d62fa0
-    Reviewed-on: https://code.wireshark.org/review/6506
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 0b271aa
-Author: Evan Huus <eapache@gmail.com>
-Date:   Mon Jan 12 10:08:29 2015 -0500
-
-    Remove ep_strbuf code
-    
-    Thanks to Michael's work, it is now totally unused.
-    
-    Change-Id: I67b5f7c69535a08f96f449c36c429e2548f4ea11
-    Reviewed-on: https://code.wireshark.org/review/6505
-    Petri-Dish: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit f699f61
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Fri Jan 9 16:44:15 2015 -0500
-
-    Error out if the user requests the SBC library but it's not found.
-    
-    Change-Id: I7c152420703d0d37c7b29d3c8f535b17180e020a
-    Reviewed-on: https://code.wireshark.org/review/6455
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-
-commit 7967ef9
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Jan 9 19:50:09 2015 -0500
-
-    Remove emem APIs from UAT functionality.
-    
-    Change-Id: I009c09f25d170e5c9aaaef713eaacb3252817856
-    Reviewed-on: https://code.wireshark.org/review/6460
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 554a397
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Mon Jan 12 13:58:49 2015 +0100
-
-    [GPRS CDR] Add expert info for unknown record types.
-    
-    Change-Id: Ib485f435b6c423b06c7c31f2cf681d01261bfc15
-    Reviewed-on: https://code.wireshark.org/review/6504
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d7bce33
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Mon Jan 12 11:26:59 2015 +0000
-
-    Fix Cygwin path
-    
-    Fix the Cygwin path added for tests so that Cygwin comes after the
-    existing path and that the correct link command is found for exntest.
-    
-    Same change to runa2x.sh to be consistent.
-    
-    Change-Id: I177a5e7d17a0077b0e8ca7d264d7e725a5312e24
-    Reviewed-on: https://code.wireshark.org/review/6503
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-    Tested-by: Graham Bloice <graham.bloice@trihedral.com>
-
-commit 0385d15
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Sun Jan 11 20:37:03 2015 +0000
-
-    Fix Cygwin path in runa2x.sh
-    
-    As I don't have Cygwin on the path, the uname -o call failed.
-    The method used here seems to work reliably without needing Cygwin
-    on the path.
-    
-    Change-Id: I206db542b5e89895a43c48626e2d14fff380fc8f
-    Reviewed-on: https://code.wireshark.org/review/6497
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-
-commit a49e1d5
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Fri Jan 2 17:20:46 2015 +0000
-
-    Make running the tests a little easier on Windows
-    
-    1.  Set the igncr option a little differently, this is the preferred
-        way according to the latest Cygwin bash update announcement
-        (See https://sourceware.org/ml/cygwin-announce/2014-10/msg00015.html, Sect 4a)
-        The previous way didn't work for me.
-    2.  Ensure /usr/bin is on the path if running under Cygwin.
-        I really don't want Cygwin on my normal paths, the build process
-        adds if required, so this change makes the test scripts do the same.
-    
-    Change-Id: I0f4da1fa87802bf0a4039bb5a91e577fae506d79
-    Reviewed-on: https://code.wireshark.org/review/6243
-    Tested-by: Graham Bloice <graham.bloice@trihedral.com>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-
-commit 2619edd
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Jan 9 16:39:47 2015 +0100
-
-    [E212] Make it possible to use different filters for MCC and MNC in LAI
-    RAI and SAI.
-    
-    Change-Id: I2abcc868899b8752f66347b3a0fe190670c3ce3f
-    Reviewed-on: https://code.wireshark.org/review/6447
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e974a6f
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Jan 10 16:13:31 2015 +0100
-
-    msg_rng_rsp (Wimax): fix Copy-paste error (CID 11158604)
-    
-    Change-Id: I134d8178d741d741404963a89f60e1d1bfd9a2dd
-    Reviewed-on: https://code.wireshark.org/review/6473
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 706c625
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Dec 19 11:09:28 2014 +0100
-
-    ISIS: Add code and length for SubTLV Extended IS Reachability
-    
-    * remove some proto_tree_add_text call
-    
-    Change-Id: I18bc26cc95934e77b19d24edbb417af4c895d53e
-    Reviewed-on: https://code.wireshark.org/review/6468
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ca17499
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Fri Jan 9 16:47:44 2015 -0500
-
-    Add DJI UAV Drone Control Protocol to the list of new protocols.
-    
-    (This change also brings NEWS up to date with release-notes.asciidoc)
-    
-    Change-Id: Ie61c27901947210ddf95bbb1bb8c36e489bc0c8c
-    Reviewed-on: https://code.wireshark.org/review/6456
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 4a0ec75
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jan 11 13:18:39 2015 -0800
-
-    Use the GTK+ 2 name for VoidSymbol.
-    
-    We can use the GTK+ 2 GDK_xxx names with GTK+ 2 or 3; apparently, some
-    versions of GTK+ 2 don't support the GDK_KEY_xxx names.
-    
-    Change-Id: I52b14a7f2273f2af2b914c3646eb33d21673057e
-    Reviewed-on: https://code.wireshark.org/review/6498
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 528a857
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Sat Jan 10 21:29:57 2015 +0000
-
-    Fix CMake generation and use of Windows .rc files
-    
-    CMake now generates local copies of .rc files for all the Windows
-    components and uses the files in the build of the components.
-    
-    The .rc.in files that include an icon were modified to allow the icon
-    path to be set by CMake.  The path is removed for nmake builds.
-    
-    Updated build architecture detection, required for wireshark.manifest.in
-    
-    Change-Id: I7b1ff43050e9b0efb861d1041636fb4aef49a4f8
-    Reviewed-on: https://code.wireshark.org/review/6482
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-
-commit 7d004dc
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Jan 11 20:53:11 2015 +0100
-
-    Revert "Lemon: Update lemon tools"
-    
-    This reverts commit 5855dd8d538eb81d4825961b1bf0d583bf96f751.
-    
-    This Lemon update fails to compile on OSX and triggers asserts on other platforms
-    
-    Change-Id: I12a8a2bf32db31e5a9b0cb1a67a39724e30f3e91
-    Reviewed-on: https://code.wireshark.org/review/6496
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit c8c9917
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Jan 11 15:35:08 2015 +0100
-
-    Fix some more regressions introduced in gecaa1f8
-    
-    Convert one other set of static variables to pinfo scoped memory while we are at it
-    
-    Change-Id: If550b76ef6a4dd2707d79de8579ac439d16dce79
-    Reviewed-on: https://code.wireshark.org/review/6490
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5855dd8
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Aug 27 22:20:12 2014 +0200
-
-    Lemon: Update lemon tools
-    
-    Fix warning: declaration shadows a variable in the global scope [-Wshadow]
-    
-    Add include <config.h>
-    
-    Fix warning: unused parameter 'argc' [-Wunused-parameter] (using _U_)
-    
-    Fix implicit conversion loses integer precision
-    
-    Fix comparison of integers of different signs: 'size_t' (aka 'unsigned long') and 'int' [-Wsign-compare]
-    
-    Fix function declaration isn’t a prototype [-Wstrict-prototypes]
-    
-    Fix warning: old-style function definition [-Wold-style-definition]
-    
-    Fix trailing whitespace
-    
-    Fix use -T for template for epan\Makefile.nmake, epan\dfilter\Makefile.nmake, plugins\mate\Makefile.nmake, plugins\tpg\Makefile.nmake and cmake/modules/UseLemon.cmake
-    
-    Fix -Wmissing-prototypes
-    
-    Remove unused function (acttab_free)
-    
-    Add basename the filename with only filename (no path...)
-    
-    Change-Id: Ia79f61e29f828575df61cc89134c6c553044e86d
-    Reviewed-on: https://code.wireshark.org/review/3976
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 74b20dc
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu Dec 18 12:31:49 2014 +0100
-
-    gtk: fix crash on Broadway GDK backend
-    
-    The Broadway GDK backend does never sets event->string. This results in
-    a crash when filter_string_te_key_pressed_cb tries to read its contents.
-    
-    Since the documentation marks reading the string as deprecated, try to
-    handle the character conversion here. It is based on
-    _gdk_x11_event_translate_keyboard_string (from gtk+), but without trying
-    to interpret Escape as '\033', and without trying to convert control
-    characters (example: Ctrl + 1). A buffer of 6 bytes is used to hold a
-    UTF-8 code point (there is no zero terminator, so 7 bytes as found in
-    the original implementation is unnecessary).
-    
-    As g_locale_from_utf8 returns dynamically allocated memory, change the
-    control flow to have a single exit point where pointers are freed as
-    needed.
-    
-    Reproduce with gtk3:
-    $ broadwayd :5
-    $ GDK_BACKEND=broadway BROADWAY_DISPLAY=:5 wireshark-gtk
-    (now open http://localhost:8085/ and start typing in the display filter)
-    
-    Keys tested: e € (AltGr + 5) ü (AltGr + ", u)
-    In the X11 backend, these still get displayed correctly. In the broadway
-    backend however, the accents are missing due to a bug in the broadway
-    implementation.
-    
-    Change-Id: Ic1f0ee2b87cd573023ee8e966f06489b3b744dcf
-    Reviewed-on: https://code.wireshark.org/review/5832
-    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
-
-commit ae2888a
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sat Jan 10 18:02:07 2015 -0800
-
-    CMake: Try to fix Cygwin a2x discovery.
-    
-    Change-Id: I46ddd10ab533ff7114aa6a4241a9a261da19329c
-    Reviewed-on: https://code.wireshark.org/review/6487
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 9b9a06c
-Author: Robert Grange <robionekenobi@bluewin.ch>
-Date:   Sun Jan 11 12:57:06 2015 +0100
-
-    packet-mq: Avoid using sort in dissector
-    
-    Avoid using sort for string_value_ext. The string value are now
-    sorted at definition
-    
-    Change-Id: I08452b0423289d04e55ed7e3573e74bfcc329865
-    Reviewed-on: https://code.wireshark.org/review/6488
-    Reviewed-by: Robert Grange <robionekenobi@bluewin.ch>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 9d55a0b
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Jan 11 08:05:06 2015 -0800
-
-    [Automatic manuf, services and enterprise-numbers update for 2015-01-11]
-    
-    Change-Id: I2f9625ebc812095bd4c7464981a96b38c4548694
-    Reviewed-on: https://code.wireshark.org/review/6491
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit f2bedeb
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Jan 11 14:54:24 2015 +0100
-
-    FDDI: fix a memory corruption introduced in gecaa1f8
-    
-    Bug: 10845
-    Change-Id: I4d47711f397d9aaa965dff3e97478517f638a2e2
-    Reviewed-on: https://code.wireshark.org/review/6489
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit aa9376e
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Jan 10 19:19:04 2015 +0100
-
-    LTE RRC: upgrade dissector to v12.4.0
-    
-    Change-Id: I0bd6c124bd3aa0efe09db81135adc690751e08ae
-    Reviewed-on: https://code.wireshark.org/review/6477
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit d07364d
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Jan 10 12:41:04 2015 -0500
-
-    Restore #undef HAVE_STDLIB_H and #undef HAVE_STRING_H in kerberos dissector.
-    
-    These were removed when the kerberos dissector was switched to being a pure ASN.1 dissector (see dea68bf00f7c5872950814da81ba532a6372ccb3).
-    
-    Change-Id: I04177046250d039a750f4e4e4dd956d8beab23bc
-    Reviewed-on: https://code.wireshark.org/review/6476
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f5c4d06
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Jan 10 19:04:06 2015 -0500
-
-    Replace some "low hanging fruit" uses of emem.
-    
-    Most of the remaining ep_ uses are grouped with specific functionality.
-    
-    Change-Id: I8fa64a17acc6bcdcf6891b2d28715ac0c58f1a4a
-    Reviewed-on: https://code.wireshark.org/review/6484
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit fdd6554
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jan 10 16:26:46 2015 -0800
-
-    Rename the FT_BYTES separator types to SEP_ from BASE_.
-    
-    There's no requirement for "display" field values to have names
-    beginning with BASE_; use SEP_, to indicate that they're separators.
-    
-    (And, yes, we should introduce SEP_NONE, with a value of 0, and use it.)
-    
-    While we're at it, fix BASE_SEMICOLON - the separator is a colon, not a
-    semicolon - and document SEP_SPACE in doc/README.dissector.
-    
-    Change-Id: I856aafda2c60b8320dffe287f0deb06a9604a2bf
-    Reviewed-on: https://code.wireshark.org/review/6486
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit b4f5b6e
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Sun Jan 11 00:05:42 2015 +0000
-
-    Update CMake "Project names" and Folders
-    
-    This gives a more structured layout in Visual Studio
-    
-    Change-Id: I0da87a3e5ec759c69aeee031366cf287485cdac2
-    Reviewed-on: https://code.wireshark.org/review/6485
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-    Tested-by: Graham Bloice <graham.bloice@trihedral.com>
-
-commit b2f03cb
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sat Jan 10 14:41:55 2015 -0800
-
-    make-version.pl updates.
-    
-    Set the version variables in CMakeLists.txt directly from
-    make-version.pl instead of pulling them from configure.ac.
-    
-    Use the correct default value for VERSION_EXTRA in config.nmake.
-    
-    wireshark-common.files was removed in g97e1491. We don't need to update
-    it any more.
-    
-    Change-Id: I751b6df9ac16e19090712aa79a68e308397c1d25
-    Reviewed-on: https://code.wireshark.org/review/6483
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 2219f78
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Sat Jan 10 19:48:05 2015 +0000
-
-    Netflow: do transport resolution on ports (if know they are UDP or TCP)
-    
-    Change-Id: I8fc3675f03b7eaec6a9385638197067981762a70
-    Reviewed-on: https://code.wireshark.org/review/6474
-    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-
-commit 14cad60
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Jan 10 14:20:06 2015 -0500
-
-    Remove ep_ allocated memory from get_conversation_filter and just return a g_alloced string.
-    
-    Change-Id: Ie7f6b2c5479fec1a44afb5e446ef6abf304113af
-    Reviewed-on: https://code.wireshark.org/review/6480
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 59c1e32
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Jan 9 12:51:15 2015 -0500
-
-    Add BASE_SPACE for FT_BYTES
-    
-    It's just like BASE_DOT, BASE_DASH and BASE_SEMICOLON, only its a space between bytes.  Since this seems pretty specific to FT_BYTES, perhaps there is a better was to represent the functionality (like FT_BOOLEAN uses numeric values for number of bits)?
-    
-    Change-Id: I1a8f1ab263ece2736a8012b66fdd6a9105db7282
-    Reviewed-on: https://code.wireshark.org/review/6451
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit effc826
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Jan 4 11:17:53 2015 -0500
-
-    Add preference to display spaces between bytes for FT_BYTES fields.
-    
-    I think this can make fields more readable (for a small amount of bytes).
-    
-    Converted DeviceNet dissector to use proto_tree_add_item for some FT_BYTES field as tvb_bytes_to_str_punct was used to create this effect "manually".
-    
-    Change-Id: I59e2acf9b00a4eb1279e6c2b2b7bd8ecef20db9b
-    Reviewed-on: https://code.wireshark.org/review/6304
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 02fb290
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jan 10 11:47:46 2015 -0800
-
-    Sort the value_string_exts at dissector registration time.
-    
-    You *CANNOT* defer it until dissection time, otherwise "tshark -G
-    values" will fail.
-    
-    Change-Id: I4edf9abda271baaf916f020a211b9add5543ecc7
-    Reviewed-on: https://code.wireshark.org/review/6481
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 531a9f0
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jan 10 11:39:43 2015 -0800
-
-    Squelch a compiler warning.
-    
-    The clang I'm using warns about a non-constant format string in
-    val_to_str_ext() calls; get rid of the unknown_format variable and,
-    instead, make two different proto_item_append_text() calls with
-    different format arguments in the val_to_str_ext()-call arguments.
-    
-    Change-Id: Id668efe666634798c278958bd7e6d790ec476539
-    Reviewed-on: https://code.wireshark.org/review/6479
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 51acf16
-Author: Robert Grange <robionekenobi@bluewin.ch>
-Date:   Fri Jan 9 11:06:10 2015 +0100
-
-    packet-mq: sort some value_string_ext in dissector
-    
-    Some value_string_ext are sorted only in the dissector,
-    and only once.
-    
-    Adapted as said in comments.
-    Added test for sort in dissect_mq_spx
-    
-    Change-Id: If72159fe96ab28a3ed540778d67996e152b4f110
-    Reviewed-on: https://code.wireshark.org/review/6444
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit b760da9
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Jan 10 10:16:37 2015 +0100
-
-    MQ: ensure that at least 4 bytes were captured before doing heuristic checks
-    
-    Otherwise it could trigger an exception
-    
-    Change-Id: I280e3c5d9e5554e4be49035c03e0170ae4495e6e
-    Reviewed-on: https://code.wireshark.org/review/6463
-    Reviewed-by: Robert Grange <robionekenobi@bluewin.ch>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 7600ddb
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Jan 10 16:12:29 2015 +0100
-
-    UTS: fix Copy-paste error (CID 11158603)
-    
-    Change-Id: Ibabb8ab3ccb0543856c84822542baa1ac0139f7e
-    Reviewed-on: https://code.wireshark.org/review/6472
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 15ac6eb
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Jan 10 16:12:07 2015 +0100
-
-    ISMACRYP: fix Copy-paste error (CID 11158602)
-    
-    Change-Id: I4978627115f46a8aa90ccf67f7c008cdf9986da6
-    Reviewed-on: https://code.wireshark.org/review/6471
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e2fa5a5
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Jan 10 16:11:41 2015 +0100
-
-    CTDB: fix Copy-paste error (CID 11158596)
-    
-    Change-Id: Ieaa70505f4b880569be6126166a71f32d84f79a8
-    Reviewed-on: https://code.wireshark.org/review/6470
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6780519
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Jan 10 16:11:15 2015 +0100
-
-    NLM: fix Copy-paste error (CID 11158588)
-    
-    Change-Id: I0d2736f3e00c62bb908e346a641d0ddc8b171fd2
-    Reviewed-on: https://code.wireshark.org/review/6469
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 0f6b09d
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Jan 10 16:26:55 2015 +0100
-
-    to_str (epan): fix parameter 'scope' not found in the function declaration [-Wdocumentation]
-    
-    Change-Id: Ie414d28415b71a79780d37fae454b90a7a610e1c
-    Reviewed-on: https://code.wireshark.org/review/6475
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 1a30c97
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Fri Dec 19 15:43:50 2014 +0100
-
-    Bluetooth: A2DP: APT-X: Unhardcode stream configuration
-    
-    Change-Id: I16cfb4d014020a7fb2c67fef3128021c9901719a
-    Reviewed-on: https://code.wireshark.org/review/6442
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit f343710
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Mon Dec 29 09:45:40 2014 +0100
-
-    Bluetooth: HCI: Detect Vendor by "Read Local Version Information"
-    
-    There is information about manufacturer of Bluetooth chip.
-    Also try to detect if that "permament" info is not changed,
-    if so informs user about this rare event (probably there is an issue)
-    
-    Change-Id: I1fa748a67ad7943e61d4445d240f0578b94560fc
-    Reviewed-on: https://code.wireshark.org/review/6408
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 55df238
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Mon Dec 29 08:53:15 2014 +0100
-
-    Bluetooth: SMP: Add missing opcode for "Identity Address Information"
-    
-    Also fix tvb_length, tvb_length_remaining warnings.
-    
-    Bug: 10299
-    
-    Change-Id: Ib8b55ea9f2220394a5896d13e5cc4e2cefff1e13
-    Reviewed-on: https://code.wireshark.org/review/6407
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit d6e0409
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Tue Dec 23 14:57:45 2014 +0100
-
-    Bluetooth: Add HCI Vendor Broadcom dissector
-    
-    Since those command/events are vendor specific and proprietary
-    not all commands/events are implemented. All implemented commands can be
-    found in Open Source implementations for Broadcom chip. If you found more,
-    please let me know.
-    
-    Change-Id: Ie68d3737c88a8cef39260a9d93192cfc81871d6c
-    Reviewed-on: https://code.wireshark.org/review/6406
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit c69b2ab
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Sat Jan 3 16:26:53 2015 +0100
-
-    Bluetooth: ATT: Dissect opcode with more precision
-    
-    Change-Id: Iddc1a6d899b10b0d5c25723a71da7dcd11c6dfad
-    Reviewed-on: https://code.wireshark.org/review/6405
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 7177ced
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Wed Dec 17 16:12:41 2014 +0100
-
-    USB: Fix Conversation/Endpoint filters
-    
-    There were not fields for that, so simple add them.
-    
-    Change-Id: I489bae24ac96ea0baf395add731f4d62ccf19352
-    Reviewed-on: https://code.wireshark.org/review/6401
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit c93d0ab
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Jan 9 17:12:26 2015 +0100
-
-    IS-IS: Incorrect decoding of IPv4 Interface/Neighbor Address sub-TLVs in Extended IS Reachability TLV
-    
-    Correct 4-byte IPv4 address is incorrectly detected as wrong 6-byte IPv4 address and cannot be decoded (IPv4 Interface Address (sub-TLV type 6) and IPv4 Neighbor Address (sub-TLV type 8) of Extended IS Reachability TLV (TLV type 22) of IS-IS.
-    
-    Wrong offset for some Sub-TLV
-    
-    Issue found by Alexander Okonnikov
-    
-    Bug: 10837
-    Change-Id: I81d083722da72115e1905237352650d380e9d0ac
-    Reviewed-on: https://code.wireshark.org/review/6453
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5fe1f66
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Jan 9 23:04:47 2015 -0500
-
-    Finish off emem_strbuf_t usage.
-    
-    Change-Id: Ib0b911c86a7f8a7cca022e9e324c910664ce397e
-    Reviewed-on: https://code.wireshark.org/review/6461
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3a9869d
-Author: Evan Huus <eapache@gmail.com>
-Date:   Fri Jan 9 12:28:10 2015 -0500
-
-    Remove/replace ep_strsplit()
-    
-    Change-Id: I4a803d83844d937804849b2ad3b067381c9b96d0
-    Reviewed-on: https://code.wireshark.org/review/6448
-    Petri-Dish: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e54b5f0
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Jan 9 10:39:17 2015 -0800
-
-    CMake: Copy admonition graphics to the correct directory.
-    
-    Change-Id: Iecba4000c487a90efedfc7547771539c3748a7f0
-    Reviewed-on: https://code.wireshark.org/review/6454
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 8bd80e0
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Jan 9 13:53:17 2015 -0800
-
-    CMake: Set WIRESHARK_TARGET_PLATFORM.
-    
-    Set WIRESHARK_TARGET_PLATFORM near the top of CMakeLists.txt.  It's used
-    by a couple of our modules and will be used for NSIS packaging.
-    
-    Change-Id: Ief43733bdf162998cd54ff3732f94c8baa3d1e11
-    Reviewed-on: https://code.wireshark.org/review/6458
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit a81f0d1
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Jan 9 14:15:39 2015 -0800
-
-    Fix airpdcap debugging code.
-    
-    Change-Id: Ied1094dd3c6ad176fea830c0857ba43e09d3cb10
-    Reviewed-on: https://code.wireshark.org/review/6457
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 2bb26ea
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Jan 9 10:23:51 2015 -0800
-
-    CMake: Copy CHM graphics from the correct source.
-    
-    Change-Id: Iea67bdaf8d83009c808bd39693fe273b3181ff76
-    Reviewed-on: https://code.wireshark.org/review/6452
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit f5de0c4
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Fri Jan 9 18:11:26 2015 +0000
-
-    Netflow: Fix some duplicate label names
-    
-    Change-Id: I077bdd6394898a445c00a1e7aec1c4c11b3e9ec2
-    Reviewed-on: https://code.wireshark.org/review/6450
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-
-commit 4f65899
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Jan 9 08:58:15 2015 -0800
-
-    CMake: Migrate to hhc.cmake.
-    
-    Remove FindHHC.cmake in favor of CMake's FindHTMLHelp. Remove the
-    hhc.cmd wrapper.
-    
-    Change-Id: I548e58d2264c74596e9067d5053b056c35089b3c
-    Reviewed-on: https://code.wireshark.org/review/6449
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit ffb6f10
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Jan 8 17:16:09 2015 -0800
-
-    CMake: Cygwin-ify the xmllint path as well.
-    
-    Change-Id: I5e62ed6baeed3fcb76cdffd30666ad01713acd2a
-    Reviewed-on: https://code.wireshark.org/review/6439
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 1b4f965
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Jan 2 15:28:20 2015 +0100
-
-    Some typos fixed.
-    
-    Change-Id: I65df0c40d771c4854b73fd5c35d1af600f15f324
-    Reviewed-on: https://code.wireshark.org/review/6445
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 872a239
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Jan 9 10:16:06 2015 +0100
-
-    Add missing #include ( "ui/gtk/old-gtk-compat.h" )
-    
-    Change-Id: Ic53c3cd4a38c587ab3c0dcb9f8349ca50e338f80
-    Reviewed-on: https://code.wireshark.org/review/6443
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 284229c
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Jan 8 13:16:01 2015 -0500
-
-    Convert EUI64 address APIs to use wmem.
-    
-    Change-Id: I57d2e435ac72ea07ec9a567e0b1ce4410966e3d2
-    Reviewed-on: https://code.wireshark.org/review/6419
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 17f1a44
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Fri Dec 19 15:41:57 2014 +0100
-
-    Bluetooth: AVDTP: Fix other-side Reconfigure
-    
-    It is used to properly configure internal SEP data using to
-    properly decode music stream.
-    
-    Change-Id: If8a15267ce072eaedfac947d7558be2d3e796483
-    Reviewed-on: https://code.wireshark.org/review/6404
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 5be440f
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Thu Dec 18 10:42:01 2014 +0100
-
-    Bluetooth: AVDTP/VDP: Add link to first and last packet in the stream
-    
-    Useful for analyzing stream issues.
-    
-    Change-Id: I1c9f43807dc3abc050cf17c971fbd270b812faa5
-    Reviewed-on: https://code.wireshark.org/review/6402
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 879a221
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Thu Dec 18 15:19:50 2014 +0100
-
-    Bluetooth: BTLE RF: Remove tree and reduce indentation level
-    
-    Useless check for tree avoid setting Bluetooth addresses.
-    
-    Change-Id: If38465679370c5ea74f6d916e409e337d60cf7db
-    Reviewed-on: https://code.wireshark.org/review/6403
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 6a6e2ef
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Jan 8 12:13:18 2015 -0500
-
-    Have ipxnet addresses use wmem scoped memory.
-    
-    Change-Id: I1d8eed2ceacccce2768590f0689cd2c83a5e56e9
-    Reviewed-on: https://code.wireshark.org/review/6418
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 456095c
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Jan 8 11:54:36 2015 -0500
-
-    disperse atalk-utils.[ch]
-    
-    The functionality was suiting for address_to_str.c and the #defines belong in packet-atalk.h.  Kept the address structure with the "address string conversion", but that can probably be better cleaned up when the address to str as a whole is cleaned up.
-    
-    Would also consider making AT_ATALK an FT_ type as well.
-    
-    Change-Id: Ia534096c707e6fb94acdfee0d332beda6571c371
-    Reviewed-on: https://code.wireshark.org/review/6417
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d296c75
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Jan 8 13:59:33 2015 -0500
-
-    Some more random removal of ep_ memory.
-    
-    Change-Id: I6eccd20280e907bd9e6a5fcf873ccf80afddecac
-    Reviewed-on: https://code.wireshark.org/review/6416
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 45cbdbc
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Jan 8 10:01:56 2015 +0100
-
-    Add missing #include ( "ui/gtk/old-gtk-compat.h" )
-    
-    Change-Id: I03ddea2fc7db52df1ff3571e196250bc5e3ff036
-    Reviewed-on: https://code.wireshark.org/review/6410
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit fb40fd3
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Fri Jan 9 02:34:21 2015 +0100
-
-    Add a possible replacement for the cmd hack to work around hhc.exe
-    returning non-null on success.
-    To be invoked via "cmake -P hhc.cmake <single-arg>".
-    
-    Change-Id: Ib2584379c512cbd7f437f36ef932b372fe02203a
-    Reviewed-on: https://code.wireshark.org/review/6440
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 4bc8d0f
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Jan 8 16:55:26 2015 -0800
-
-    CMake: Try to fix the xsltproc path.
-    
-    Try to make the xsltproc path compatible with Cygwin. This is a blind
-    attempt to fix the Windows 8 buildbot. It works fine locally.
-    
-    Change-Id: Ib9d55dd07c6b17cfddf313716227d347109d2103
-    Reviewed-on: https://code.wireshark.org/review/6438
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 67b1593
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Jan 8 16:16:56 2015 -0500
-
-    Remove proto_tree_add_ax25
-    
-    There isn't a legitimate use for the API, all cases can be covered with proto_tree_add_item.  As a bonus, a few more tvb_get_ptr calls can be removed.
-    
-    Change-Id: I3bb86ba8f05ef3363407bcfe9b059ee27ebc135d
-    Reviewed-on: https://code.wireshark.org/review/6429
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ecaa1f8
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Jan 8 17:07:25 2015 -0500
-
-    convert variables that were static just because of SET_ADDRESS macro to use the proper pinfo->pool instead.
-    
-    Change-Id: I914918d9629f654ead497dddac0f412b690e4409
-    Reviewed-on: https://code.wireshark.org/review/6430
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a2abf8b
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Fri Jan 9 02:04:49 2015 +0100
-
-    Fix CMake Warning "Argument not separated from preceding token by whitespace."
-    
-    Change-Id: I1ecd3bd0081c2f69d4e4f21f84cb46d086b657a2
-    Reviewed-on: https://code.wireshark.org/review/6437
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit ab717f2
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Fri Jan 9 01:58:52 2015 +0100
-
-    Use the FindHTMLHelp.cmake provided by cmake to find the hhc.
-    Lower case some function/macro calls.
-    
-    Change-Id: I57532e3b4701963b88a536a7ecfe7dfaf4be3d4c
-    Reviewed-on: https://code.wireshark.org/review/6436
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 03f273a
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Jan 8 15:39:27 2015 -0800
-
-    HTML Help: Fix titles.
-    
-    AsciiDoc converts single quotes into curly quote entities, which HTML
-    Help doesn't support. Use sed to fixup the title string.
-    
-    We might want to drop HTML Help at some point.
-    
-    Change-Id: I0c7d3be90c0de7dbac0f1367cc6ba323c7380939
-    Reviewed-on: https://code.wireshark.org/review/6435
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 315cc72
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Jan 8 16:27:34 2015 -0800
-
-    CMake: Revert the release notes xsltproc command.
-    
-    Should fix the release_notes_txt target.
-    
-    Change-Id: Ie930c49ad34ad70070b8f7d28d79bee55f263c40
-    Reviewed-on: https://code.wireshark.org/review/6434
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 1baf9bb
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jan 8 15:50:15 2015 -0800
-
-    Use G_GINT64_CONSTANT() for 64-bit constants.
-    
-    Change-Id: I2b4f24c0e68f8d1edb53981b2ada7db6cd0eff72
-    Reviewed-on: https://code.wireshark.org/review/6433
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit cd7408e
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Jan 6 16:59:32 2015 -0800
-
-    CMake: Enable DocBook on Windows.
-    
-    Add a wrapper script and CMake macros which lets us run Cygwin's a2x
-    from Windows. Add *another* wrapper script that ignores the return value
-    of hhc.exe.
-    
-    Move the ASCIIDOC2DOCBOOK macro to FindASCIIDOC.cmake. Add FindHHC.cmake.
-    Add hints to FindFOP.cmake.
-    
-    Use unique file names in the HTML Help chain in an attempt to avoid a
-    race condition.
-    
-    To do:
-    - Fix curly quote in HHC title.
-    
-    Change-Id: I9b154b7fbd02703656e2ab380199ec0a6db4e36d
-    Reviewed-on: https://code.wireshark.org/review/6379
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 4b8c668
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jan 8 13:25:54 2015 -0800
-
-    To register an SCTP port, register in "sctp.port", not "udp.port".
-    
-    Change-Id: I8f013b2895e42919ea0d97cdc35414ea3f5aec9b
-    Reviewed-on: https://code.wireshark.org/review/6422
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit d8773b1
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Jan 8 21:08:13 2015 +0100
-
-    MQ: fix crash at startup
-    
-    the array given to qsort algorithm must be alterable
-    
-    Change-Id: I811cade161b7635e9bc9e070c1ec37d2cce50d1f
-    Reviewed-on: https://code.wireshark.org/review/6420
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit c94192d
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Thu Jan 8 16:08:06 2015 +0000
-
-    Netflow: add (hidden) root filters for each vendor with supported 'pie' entries
-    
-    Change-Id: I2bdca4c092c247ab253d6ceb3770ac7ea935cdad
-    Reviewed-on: https://code.wireshark.org/review/6414
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-
-commit 8bfd306
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Wed Dec 31 10:53:25 2014 +0100
-
-    Bluetooth: Update to latest Assigned Numbers (up to 4.2)
-    
-    Also start decoding next two profile attribute groups in SDP
-    (MPS and CTN) and add new two fields in EIR/AD.
-    
-    Change-Id: I4dc13df2b3b13e8c2a2a5c4af2cabae9ee83d539
-    Reviewed-on: https://code.wireshark.org/review/6409
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 90453a4
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Thu Jan 8 10:42:51 2015 -0500
-
-    mka: Minor cleanup
-    
-      Remove unneeded/unused code;
-      Remove 'dead initializers';
-      tvb_captured_length() ==> tvb_reported_length();
-      Reformat a few long lines.
-    
-    Change-Id: I4a09bf330e939613ea8a47e69d4fc7b21dd496e8
-    Reviewed-on: https://code.wireshark.org/review/6413
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit e123878
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Thu Jan 8 10:40:25 2015 -0500
-
-    zbee-zcl-misc: Minor changes
-    
-      tvb_captured_length() --> tvb_reported_length();
-      whitespace changes.
-    
-    Change-Id: Id9c302d84f28ec23e554445777c7685c8d09918c
-    Reviewed-on: https://code.wireshark.org/review/6412
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit e63e771
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Tue Dec 30 09:11:03 2014 +0100
-
-    Bluetooth: AVDTP: Present bitfields for codec ad true/false
-    
-    Previously they are present as hex value.
-    
-    Change-Id: Ia30ba4da02e6bd4b0d68987506245e0534feadb6
-    Reviewed-on: https://code.wireshark.org/review/6400
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2d448f0
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Jan 2 22:19:53 2015 -0500
-
-    Eliminate proto_tree_add_text from some dissectors.
-    
-    Change-Id: Ief4c377d56748e1a8ed0ef7fe5ba03b9be00cd8d
-    Reviewed-on: https://code.wireshark.org/review/6267
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2021845
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Tue Dec 30 11:18:35 2014 +0100
-
-    autotools: Add possibility to build without optional codec SBC
-    
-    SBC is optional but build any time if configure script detect it,
-    so let user choose if it really want it. Default to build with SBC.
-    
-    Bug: 10794
-    
-    Change-Id: I1b936c628c9de0179aa3d5da5ac547bd910af8ba
-    Reviewed-on: https://code.wireshark.org/review/6399
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 0078211
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Thu Jan 8 11:16:27 2015 +0100
-
-    Add quotation marks in Conversations/Endpoints when address is string
-    
-    Change-Id: I39d49542cd563db1f6d3423b4e382a9a5e1c801b
-    Reviewed-on: https://code.wireshark.org/review/6398
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit ec8ca91
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Jan 8 11:36:35 2015 +0100
-
-    BTSDP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
-    
-    Change-Id: I48ddaa9ffe8f81094d63dd886dd15bb63888cbd7
-    Reviewed-on: https://code.wireshark.org/review/6396
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a3e934f
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Jan 8 11:36:21 2015 +0100
-
-    BATADV: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
-    
-    Change-Id: I3c33511389aa2f4b3eed73f1c712561b20e18bf7
-    Reviewed-on: https://code.wireshark.org/review/6395
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit bd1cd01
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Thu Jan 8 12:22:18 2015 +0100
-
-    GTK/RTP Player: Fix crash when touch RTP Stream
-    
-    Move converts of addresses when they are really valid.
-    
-    Change-Id: Ie0c77e8e23bd97ba55d68dad7da7015b9d355b0d
-    Reviewed-on: https://code.wireshark.org/review/6397
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: Michal Orynicz <michal.orynicz@tieto.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit b6cf61b
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Jan 8 09:51:05 2015 +0100
-
-    Small parenthesis fix
-    
-    Change-Id: I6bab238a37f7309daece7a7bfc062da41819d9ff
-    Reviewed-on: https://code.wireshark.org/review/6394
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 513ed24
-Author: Evan Huus <eapache@gmail.com>
-Date:   Mon Jan 5 18:07:56 2015 -0500
-
-    ieee80211: initialize bssid for data frames
-    
-    Hypothentical fix for
-    https://bugs.launchpad.net/ubuntu/+source/wireshark/+bug/1407662 which I haven't
-    actually tried.
-    
-    Change-Id: Ib6d30873be7676eef756731a56a1d21a41c2c16c
-    Reviewed-on: https://code.wireshark.org/review/6330
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a323f0c
-Author: Robert Grange <robionekenobi@bluewin.ch>
-Date:   Sat Dec 27 17:46:33 2014 +0100
-
-    packet-mq: Add New Def, Reformat Lines, re-order val_str def
-    
-    Add missing definition, add new definition, Reformat some lines
-    Re-order the value_string used with ext_value_string definition
-    so they are in asc ASCII order as the ext_value_string is now
-    sorted before first use
-    
-    renamed own tvb_get... funct to new tvb_get_guintxx funct
-    and deleted own tvb_get... funct
-    use ptvcursor_ funct instead of own macro to increment offset
-    removed <epan/tvbuff.h> in *.c files
-    correct [-Wunused-const-variable]
-    
-    Change-Id: Iaee26289e098cde0e5787ca1c98de64b6b733fa2
-    Reviewed-on: https://code.wireshark.org/review/6079
-    Reviewed-by: Robert Grange <robionekenobi@bluewin.ch>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 37e64d8
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Jan 7 18:18:46 2015 +0100
-
-    Unistim: Nesting level does not match indendation (CID 1159216)
-    
-    Change-Id: I024f47a41328ea7e8db3c79012b892f3cb48caad
-    Reviewed-on: https://code.wireshark.org/review/6376
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit dcc4936
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Tue Jan 6 23:04:55 2015 +0100
-
-    use the http server port as index for the ws.port dissector table
-    
-    pinfo->match_uint is not set if websocket is called because of a
-    previous http Upgrade: header and http is running on a non-standard port
-    
-    Bug: 10805
-    Change-Id: Ib0d35d29fe947cfb7b21107e734c64debbb91048
-    Reviewed-on: https://code.wireshark.org/review/6353
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 866d2f8
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Jan 7 18:09:55 2015 +0100
-
-    PPCAP: Nesting level does not match indendation (CID 1259218)
-    
-    Change-Id: I3d3a4243913f7f0267342693868ec1f2981534e3
-    Reviewed-on: https://code.wireshark.org/review/6374
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 20414eb
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Jan 7 20:25:29 2015 -0500
-
-    Replace some ep_alloc and ep_alloc0 with its wmem equivalent.
-    
-    These cases were pretty easy to identify.  Also replaced some comments that referenced ep_alloced memory, when it's now in fact wmem_alloced.
-    
-    Change-Id: I07d2f390a9c0b34aa2956880476755d1acf5db0a
-    Reviewed-on: https://code.wireshark.org/review/6392
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit cff098e
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Jan 7 19:24:52 2015 -0500
-
-    guid_to_ep_str -> guid_to_str
-    
-    guid_to_str now uses wmem allocation.
-    
-    Change-Id: I8e48d1a720942fbefbaa6227ae0929cb9f856359
-    Reviewed-on: https://code.wireshark.org/review/6391
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 5d610b5
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Jan 7 18:24:17 2015 -0500
-
-    Remove decode_numeric_bitfield.
-    
-    It was only used by 1 dissector and that dissector can just use bitmasking in the hf_ field.
-    
-    Change-Id: I99179356dd7cbfab0c7be1512357a7e4c0eecde6
-    Reviewed-on: https://code.wireshark.org/review/6390
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 4a5ca5c
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Jan 7 18:13:23 2015 -0500
-
-    bytes_to_ep_str -> bytes_to_str
-    
-    Change-Id: Ifcda8328dedec0ef4104c3a124d6246f99493750
-    Reviewed-on: https://code.wireshark.org/review/6389
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2209678
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Jan 7 16:24:17 2015 -0500
-
-    ep_<protocol>_port_to_display -> <protocol>_port_to_display
-    
-    Adjust any other ep_ related APIs related to the transition.
-    
-    Change-Id: I961b371c2c4bda557e0f1817705c27eef0dae66c
-    Reviewed-on: https://code.wireshark.org/review/6388
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 907d145
-Author: David Ameiss <netshark@ameissnet.com>
-Date:   Wed Dec 10 14:21:19 2014 -0600
-
-    Various minor updates to the LBM dissectors.
-    
-    Change-Id: I36954ea0d8b525b4d7a1b3407f9e9d0e1c9bbd67
-    Reviewed-on: https://code.wireshark.org/review/6378
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit d245f38
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Jan 7 20:50:45 2015 -0500
-
-    packet-irda.c: Add editor modelines
-    
-    Change-Id: I626b60a185e750af94306892cd41dc8729920cfd
-    Reviewed-on: https://code.wireshark.org/review/6393
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit 6edb27b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jan 7 16:50:23 2015 -0800
-
-    FT_DOUBLEs are 8 bytes; use FT_FLOAT for 4-byte floating-point values.
-    
-    Change-Id: Ia39f8604229df18e1cdbbf81b78cd423e70f0f3c
-    Reviewed-on: https://code.wireshark.org/review/6386
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 8f1b82b
-Author: Luke Mewburn <luke@mewburn.net>
-Date:   Mon Dec 22 23:35:55 2014 +1100
-
-    Set the (GT) address even if the message is routed by SSN.
-    
-    If sccp.set_addresses is enabled, always SET_ADDRESS to the GT
-    if the GT is present, not just if ROUTE_ON_GT.  This fixes TCAP
-    session handling in some situations.
-    
-    Change-Id: Ic088a4de408303a34c17c42820602ed6bf113840
-    Reviewed-on: https://code.wireshark.org/review/6053
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-
-commit 5e8c053
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jan 7 11:43:15 2015 -0800
-
-    Squelch a compiler warning.
-    
-    No need for buflen to be bigger than len, which it will be on LP64 and
-    LLP64 platforms if it's size_t and len is guint32.
-    
-    Change-Id: Iffd2940187180cde1ad55ff7d3bd7c45acf22eba
-    Reviewed-on: https://code.wireshark.org/review/6380
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit ccce7ab
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Jan 7 18:13:51 2015 +0100
-
-    capture file dlg (GTK): Nesting level does not match indendation (CID 1159217)
-    
-    Change-Id: I9ae1862993a3a9d10bd7575295b08c91752cb77f
-    Reviewed-on: https://code.wireshark.org/review/6375
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit d3f67c1
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Jan 7 18:19:58 2015 +0100
-
-    S5066DTS: Nesting level does not match indendation (CID 1159211 & 1159212)
-    
-    Change-Id: I8145696de995e821793e7bc1576d5a5673c7b503
-    Reviewed-on: https://code.wireshark.org/review/6377
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit a6ba632
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Jan 7 18:07:25 2015 +0100
-
-    BTLE: Nesting level does not match indendation (CID 1261651)
-    
-    Change-Id: I11e436ca91c766edc8e85fd2402e61a17465bee2
-    Reviewed-on: https://code.wireshark.org/review/6373
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 64a7bac
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Jan 7 10:11:22 2015 -0500
-
-    tvb_bytes_to_ep_str -> tvb_bytes_to_str
-    
-    Change-Id: I79c613cbdd8dc939dd4c29ebc477fb6eefd5bfc4
-    Reviewed-on: https://code.wireshark.org/review/6371
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 98d3b14
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Jan 7 09:36:06 2015 -0500
-
-    Replace bytes_to_ep_str_punct with wmem equivalent.
-    
-    Change-Id: I8aa7d7374db94685fd875cbf358c3bfbc83f3255
-    Reviewed-on: https://code.wireshark.org/review/6370
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9cfe67f
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Jan 7 08:29:35 2015 -0500
-
-    tvb_bytes_to_ep_str_punct -> tvb_bytes_to_str_punct
-    
-    Also change bytestring_to_str to match bytes_to_ep_str_punct functionality (limiting byte string size)
-    
-    Change-Id: Idb958c7f0c203d103629469302b81fa922714f7e
-    Reviewed-on: https://code.wireshark.org/review/6369
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 493f03b
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Jan 7 00:19:55 2015 -0500
-
-    Remove bytestring_to_ep_str
-    
-    Use wmem equivalent bytestring_to_str
-    
-    Change-Id: I1ec7509e3adb36ab0f65317459653cb3b4b11af8
-    Reviewed-on: https://code.wireshark.org/review/6368
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2139110
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Dec 12 11:12:24 2014 +0100
-
-    Updates in it translation.
-    
-    Change-Id: I3a7b71daa6e4e69ef9cc6dcb777851a8643d6684
-    Reviewed-on: https://code.wireshark.org/review/6367
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 667897c
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Jan 7 17:34:33 2015 +0100
-
-    [MIP6] Update to handling of
-    Mobility Header Link-Layer Address (MH-LLA) Option
-    to RFC 5268 e.g no special handling of length.
-    Bug:10043
-    
-    Change-Id: Id32789fa5e34766c5734b0be13af015473ac257c
-    Reviewed-on: https://code.wireshark.org/review/6372
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a479d9a
-Author: Evan Huus <eapache@gmail.com>
-Date:   Wed Jan 7 09:22:30 2015 -0500
-
-    simplify tvb_address_to_str
-    
-    deduplicate most of the tvb_get_ptr calls
-    
-    Change-Id: Ic95b1d545bfebf58fc64a81f816c47d63e5ddcd0
-    Reviewed-on: https://code.wireshark.org/review/6366
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit 734e408
-Author: Orgad Shaneh <orgads@gmail.com>
-Date:   Wed Jan 7 10:25:35 2015 +0200
-
-    MSVC: Fix opting out of libraries
-    
-    When *_DIR variables are defined (even if empty), nmake tries
-    to build them and fails.
-    
-    Don't set them at all if not configured to.
-    
-    Change-Id: I3825c16f26e45a1a3fc489633084a074838f8c34
-    Reviewed-on: https://code.wireshark.org/review/6365
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-
-commit ed9a9be
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Jan 6 14:52:54 2015 -0500
-
-    Use tvb_address_to_str as an optimization
-    
-    Change-Id: Ic79d8bdc58b84087531b298b3b27273c1afccd4f
-    Reviewed-on: https://code.wireshark.org/review/6357
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4088a82
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Jan 6 14:54:03 2015 -0500
-
-    SET_ADDRESS -> TVB_SET_ADDRESS to "hide" some of the tvb_get_ptr use.
-    
-    Not all changes were able to remove their corresponding tvb_get_ptr, because there are other API dependent on the (tvb_get)pointer, but future iterations optimizing those other APIs will then be able to remove it.
-    
-    Change-Id: Id7cefd440b81834de1d1aace7cd0789b1c871a22
-    Reviewed-on: https://code.wireshark.org/review/6358
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6252074
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Jan 6 21:28:56 2015 +0100
-
-    DJIUAV: small cleanups
-    
-    - fix some typos
-    - remove a useless include
-    - change an obsolete API
-    - comment unused hf entries for now
-    
-    Change-Id: I5939bc2fe9ddc6c422f35423aa22e884f20f088d
-    Reviewed-on: https://code.wireshark.org/review/6349
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 50a9863
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jan 7 02:17:14 2015 -0800
-
-    Don't run checkapi on .rc files.
-    
-    Change-Id: I75879bfcd0d9706523447146b16c319d3eb56d23
-    Reviewed-on: https://code.wireshark.org/review/6361
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 9696eb6
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Tue Dec 30 14:31:04 2014 +0100
-
-    SMB: the "encryption key" in the negotiate response is not really a key
-    but the data for the Challenge/Response authentication
-    
-    (at least, that's my understanding of
-     http://msdn.microsoft.com/en-us/library/ee441946.aspx)
-    
-    rename the items and filter strings accordingly
-    
-    Bug: 10777
-    Change-Id: I38378f0b31252d7bc8ec5e8ad7cee81a1a48cb4d
-    Reviewed-on: https://code.wireshark.org/review/6137
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a76559e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jan 6 20:53:54 2015 -0800
-
-    Cast away an insignificant warning.
-    
-    Change-Id: Ifd74719ced4d1ff99a2a913ad6a6797d3e80b311
-    Reviewed-on: https://code.wireshark.org/review/6359
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 3bb887f
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Jan 6 23:27:36 2015 -0500
-
-    Fix compiler error because I didn't completely amend last patch.
-    
-    Change-Id: I7b8ffc4a63e69b5f50666dc1cf3482ae20124c0f
-    Reviewed-on: https://code.wireshark.org/review/6356
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 47d670d
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Jan 5 19:26:28 2015 -0500
-
-    Add tvb_address_to_str.
-    
-    This is intended to handle ALL address types retrieved from a tvbuff.
-    
-    One of the (good) side effects of this function is that it can replace a lot of the "hidden" ep_alloc calls used to allocate memory for the address string.
-    
-    A few existing "popular" helper tvb_ functions were turned into pure macros calling tvb_address_to_str.  Some of the "less used" helper tvb_ functions were just directly replaced with tvb_address_to_str.
-    
-    Change-Id: I361d991c4ad90142173e63eae02a94d68af3ec43
-    Reviewed-on: https://code.wireshark.org/review/6333
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 0f426d6
-Author: Joseph Huffman <jhuffman@codeaurora.org>
-Date:   Mon Jan 5 09:53:53 2015 -0800
-
-    Improved handling of ARDP fragmented packets.
-    
-    With the AllJoyn Reliable Datagram Protocol large packets are fragmented in
-    a way that Wireshark doesn't desegment. The AllJoyn dissector now detects
-    this situation and reports things to the user in a manner which indicates
-    things are behaving normally rather than an error condition.
-    
-    Change-Id: I1f2aa722b6e0d1ed3572ff332b4dd8c0e5c5a765
-    Signed-off-by: Joseph Huffman <jhuffman@codeaurora.org>
-    Reviewed-on: https://code.wireshark.org/review/6344
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 85e69d4
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Jan 6 15:44:19 2015 -0800
-
-    Fix GCC pragma.
-    
-    Fix "error: #pragma GCC diagnostic not allowed inside functions".
-    
-    Change-Id: Iaa7e39ac46975f00bc337b97875ba8b77295064a
-    Reviewed-on: https://code.wireshark.org/review/6355
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit e3eab83
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Jan 6 15:08:51 2015 -0800
-
-    checkAPIs: C++ comments are allowed in Windows resource files.
-    
-    Change-Id: I3885278bf293b1fd7db812ce265734bcdc904c6f
-    Reviewed-on: https://code.wireshark.org/review/6354
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 6e03daf
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Jan 6 11:52:53 2015 -0800
-
-    Try to suppress clang warnings in exntest.
-    
-    Nested TRYs result in:
-    
-        warning: declaration shadows a local variable
-    
-    Change-Id: Ifaa7baebde0ea4c18be5a53ab7e7964e84716496
-    Reviewed-on: https://code.wireshark.org/review/6347
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 119f564
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Jan 6 21:59:04 2015 +0100
-
-    MBIM: call dissector_(add|delete)_uint only when necessary
-    
-    Change-Id: I12bbe9e1d81560f1874d4e575b19db1842fa0c72
-    Reviewed-on: https://code.wireshark.org/review/6352
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit a6e6dee
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Jan 6 12:19:04 2015 -0800
-
-    NSIS: Quote all paths in config.nsh.
-    
-    Fix the MAKEDIR substitution. Add config.nsh to .gitignore.
-    
-    Change-Id: I9c5f6469569e826e4a8036b9b1b483c16558f788
-    Reviewed-on: https://code.wireshark.org/review/6351
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit f39366b
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Tue Jan 6 11:18:24 2015 +0000
-
-    NetFlow: Add Ixia 'IxFlow' fields and make some general usability improvements
-    
-    
-    - Sequence number analysis using flow sequence within an observation domain.
-    - Link back from data set to template frame, if have seen
-    - Show more information (observation domain ID, set ID, etc) in Info column and protocol roots
-    - Look up protocol field from ip_proto
-    
-    Change-Id: I3147387a3cd0d1fc33b879b3ba226753ed2cd8dd
-    Reviewed-on: https://code.wireshark.org/review/6331
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 29207bf
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jan 6 12:08:41 2015 -0800
-
-    $(MSVCR_DLL) might contain spaces, so we need to quote that sed expression.
-    
-    Change-Id: Ia3aca07a5aa8adcc99d17fa559662d79659f46ca
-    Reviewed-on: https://code.wireshark.org/review/6348
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit ea46a44
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Jan 5 12:53:46 2015 -0800
-
-    NSIS: Move definitions to their own file.
-    
-    Convert the pile-o-makensis-flags to a pile-o-sed-commands which creates
-    a "config.nsh" file. This should hopefully make it easier to port the
-    "packaging" target to CMake.
-    
-    Change-Id: I439fea5721c5b209a753044a8e9e8ac6fc5291c3
-    Reviewed-on: https://code.wireshark.org/review/6345
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit a70929c
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Jan 6 10:44:37 2015 -0800
-
-    CMake: Add an ENABLE_CODE_ANALYSIS option.
-    
-    Currently Visual Studio-only. Enabling it adds /analyze:WX- to
-    LOCAL_CFLAGS, similar to config.nmake.
-    
-    Change-Id: Ida68831e85f5f04b9f84faa95a39fed24e5f490d
-    Reviewed-on: https://code.wireshark.org/review/6346
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 087fea3
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Jan 6 10:36:37 2015 +0100
-
-    DJI UAV: Add dissector to autotools and add modelines info
-    
-    Change-Id: I2a312af906ddf01ff05083a657f474a921ab95a3
-    Reviewed-on: https://code.wireshark.org/review/6337
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit dd65274
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Tue Jan 6 16:20:04 2015 +0100
-
-    Revert e65f581ffa86f6bfd566a9b66ca2c882f465727f, which
-      reverts commit 89291ad4f3293893387b385a0800cad42215ddd4
-    Protect the new macro with "m4_ifdef" instead.
-    Add comments to keep the old and the new flags in sync.
-    
-    Change-Id: I37dea1a5c8d743f5dcf4a4d9ff38ff92200271d0
-    Reviewed-on: https://code.wireshark.org/review/6343
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 1d7da82
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Jan 6 10:41:01 2015 +0100
-
-    DNS: fix no previous prototype for 'qname_labels_count' [-Wmissing-prototypes]
-    
-    Change-Id: I2c5b662f6b46d60a97a491ca8ec01b3f0e41fa56
-    Reviewed-on: https://code.wireshark.org/review/6338
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 5fb2f27
-Author: Gerald Combs <gerald@zing.org>
-Date:   Thu Jan 1 11:41:03 2015 -0800
-
-    Qt: Add a context menu to the packet list header.
-    
-    Don't carry over the sort items from the GTK+ UI (for now, at least).
-    Update some names. Add a column editor frame similar to the "Go to
-    Packet" and "Search" frames.
-    
-    Change-Id: I1bd3834a26994de96894d2b7512bce2c19915c77
-    Reviewed-on: https://code.wireshark.org/review/6277
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit cbca7ee
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Tue Jan 6 13:58:59 2015 +0100
-
-    p_mul: Indicate if fletcher algorithm is used.
-    
-    The first version of ACP 142 uses the fletcher algorithm for checksum.
-    Indicate if this (now old variant) checksum is used.
-    
-    Change-Id: Id6f3e7ecfcde022b339bdb956cd6f642a917076a
-    Reviewed-on: https://code.wireshark.org/review/6342
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 0910b55
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Tue Jan 6 13:51:33 2015 +0100
-
-    s5066ses: Fixed some missing sapid mappings.
-    
-    The previous s5066ses commit added sapid value strings but missed
-    updating PDU type 21 and 25.
-    
-    Change-Id: I5cd4dba14eacdf2f590490a95b0cc62b04193b9e
-    Reviewed-on: https://code.wireshark.org/review/6341
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit e8568c8
-Author: Ricardo Cristian Ramirez <r.cristian.ramirez@gmail.com>
-Date:   Sun Jan 4 02:19:12 2015 +0200
+commit 5848845
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Jul 5 23:35:11 2016 +0200
 
-    s5066sis: Consume transport layer data in S5066sis
+    Qt: remove unneeded constructors.
     
-    S5066 spec describes a transport layer for some
-    clients like Acp 142 and DMP but not for all of
-    them. Since RCOP/UDOP header definition are given
-    in S'5066 specification, consuming these header
-    bytes in S'5066 SIS dissector may be appropriate
-    
-    Bug: 10827
-    Change-Id: Iffdf5d567e1a417ccbafdac919f5a5200159d31b
-    Reviewed-on: https://code.wireshark.org/review/6292
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 55de46f
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Jan 5 11:12:08 2015 -0500
-
-    Replace ep_address_to_str with address_to_str.
+    There is no need to have an empty private constructor if an explicit
+    one is already present. The former private constructor didn't initialize
+    the private members causing many CIDs from coverity.
     
-    Change-Id: I4f1078b20f41800f72a751612703ad0d4c2ae87b
-    Reviewed-on: https://code.wireshark.org/review/6323
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Change-Id: I8ba98d2b9fc32a867fdcf3421df7946b90bd7b09
+    Reviewed-on: https://code.wireshark.org/review/16311
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 124272e
-Author: Anish Bhatt <anish@chelsio.com>
-Date:   Mon Jan 5 22:50:44 2015 -0800
-
-    [PROFINET] v2: Fix swapped MaintenanceRequired & MaintenanceDemanded bits
-    
-    Fix the correct code path this time.
-    Bug: 10753
-    
-    Change-Id: I7bc2e74c91868986303e8b41b25e43a665be1860
-    Reviewed-on: https://code.wireshark.org/review/6335
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit eb98b04
-Author: Anish Bhatt <anish@chelsio.com>
-Date:   Mon Jan 5 22:26:46 2015 -0800
-
-    Revert "[PROFINET] Fix swapped MaintenanceRequired & MaintenanceDemanded bits"
-    
-    This reverts commit 0452f763fb0dd2cf7e38f0a127c306199a814c3e. Changes should
-    have been made in ChannelProperties instead of Submodule state. Current
-    implementation merely *appears* to be correct as we are reading it as a two bit
-    value but instead should be addressing it as individual bits, little endian
-    Bug: 10753
-    
-    Change-Id: Ia3bd088aeb376b8511d64352f62c4304e4129ba6
-    Reviewed-on: https://code.wireshark.org/review/6334
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit a7a1704
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Mon Jan 5 23:40:52 2015 +0000
-
-    Minor CMake updates to better group build artefacts
-    
-    Move capchild, caputils, codecs and wsutil into a Libs group
-    Move gtkui into UI group
-    Move update-sminmpec into tools group
-    
-    Change-Id: Iaf2bfe4697265af2c3ed9c9d7de2d5d1ef3cafee
-    Reviewed-on: https://code.wireshark.org/review/6332
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-    Tested-by: Graham Bloice <graham.bloice@trihedral.com>
-
-commit 1176db2
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jan 5 13:18:26 2015 -0800
-
-    Squelch harmless compiler warnings.
-    
-    (Yes, we know, we're casting 16-bit integers to pointers.  That's
-    because various generic maps need to be able to take arbitrary values as
-    keys, and sometimes the arbitrary values aren't structures to which we
-    point, but just integral values, and that's why GUINT_TO_POINTER()
-    exists, but it doesn't do enough casting to suppress harmless warnings.)
-    
-    Change-Id: I1a9c68b4b1007f0a38017ba3570b94efb0b6845a
-    Reviewed-on: https://code.wireshark.org/review/6329
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 318b8f8
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Mon Jan 5 20:41:45 2015 +0100
-
-    Beginnings of dissection of the dji drones control protocol.
-    
-    Change-Id: Ifda0b97df7e25b535a5010f25c8e8e1af83cb532
-    Reviewed-on: https://code.wireshark.org/review/6328
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 15a238a
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Mon Jan 5 20:35:25 2015 +0100
-
-    Override optimization and other flags for make based generators.
-    Before this patch it was not possible to override e.g. the optimization
-    or debug flags in case the build type was set.
-    
-    Change-Id: I53bfddd27f87ad5482227f786af8c4728c5774fc
-    Reviewed-on: https://code.wireshark.org/review/6327
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 13dbf52
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Mon Jan 5 11:37:44 2015 -0700
-
-    Attempt to fix "make distcheck" on Ubuntu buildbot
-    
-    Change-Id: I6e7ea1e2aaf839fdb3af8a3a5a47aabbb12056ef
-    Reviewed-on: https://code.wireshark.org/review/6326
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
-
-commit cbc5faa
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Sun Jan 4 22:19:24 2015 -0700
+commit 21f5c53
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Tue Jul 5 15:30:38 2016 +0100
 
-    Get rid of some GNU make extensions so users can build with
-    the make that comes with *BSD and other systems now.
+    Rename PIDL Makefile
     
-    Change-Id: Ib2eee8d37e7029202675bac35839b1c0d5fc5131
-    Reviewed-on: https://code.wireshark.org/review/6320
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
-
-commit 22b4ec9
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Jan 4 21:40:05 2015 -0500
-
-    Replace ep_display_to_address with wmem equivalent display_to_address.
-    
-    Almost all instances require using "manual" memory management, but it gets some ep_ calls out of the GUI.
+    Otherwise it will get overwritten by the in-tree cmake build.
     
-    Change-Id: Ifa7303766b08d09442ccf3d7063cbe061578ecd9
-    Reviewed-on: https://code.wireshark.org/review/6318
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9a7318a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Jan 4 13:00:54 2015 +0100
-
-    Wimax: fix no previous prototype for ... [-Wmissing-prototypes]
+    Issue reported by Rémy Léone.
     
-    Change-Id: I1dac7d362bab680c313766de19d51132d1ce6dfa
-    Reviewed-on: https://code.wireshark.org/review/6298
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I0d908973386bcb70585f5e32c36456230967bb7f
+    Reviewed-on: https://code.wireshark.org/review/16305
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 4270673
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jan 5 11:05:56 2015 +0100
-
-    OSITP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
-    
-    Change-Id: Ied8e931541e8e570ef32376eec61779a32bbd493
-    Reviewed-on: https://code.wireshark.org/review/6322
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b03a21a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jan 5 11:05:20 2015 +0100
-
-    SMTP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
-    
-    Change-Id: I234b9dad79e3327637f8cdcd406a49f9e7435f33
-    Reviewed-on: https://code.wireshark.org/review/6321
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c411029
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Jan 3 20:18:56 2015 +0100
+commit addf064
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Jul 5 22:27:55 2016 +0200
 
-    Update to QCustomPlot 1.3.0
+    Qt: remove unused variable.
     
-    Reapply remove trailing whitespace and some spelling fixes
-    Fix also a not ASCII caracter in qcustomplot.h
+    This fixes also CID 1159350.
     
-    Change-Id: Ibd5433015dd117f4d028c842a4add53041adbd11
-    Reviewed-on: https://code.wireshark.org/review/6275
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I21b55686f96131e3e1cff0feac5f16df1c7c7ca2
+    Reviewed-on: https://code.wireshark.org/review/16309
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 696fcdb
+commit 1eea415
 Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Dec 30 12:31:46 2014 +0100
+Date:   Tue Jul 5 16:30:28 2016 +0200
 
-    Added DNS statistics support
+    bgp: add return check (CID 1354417).
     
-    This affects both the dissector (that has been added with a tap interface and a stats generator) and the UI (to recall the stats menu).
-    
-    Change-Id: I90658f7aa6707aa39bdd787a51b20fed4dbddc53
-    Reviewed-on: https://code.wireshark.org/review/6236
+    Change-Id: Id8be1d5f6346686087d747167ec44df2b88dd35e
+    Reviewed-on: https://code.wireshark.org/review/16304
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Dario Lombardo <lomato@gmail.com>
 
-commit 087723a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jan 4 20:06:55 2015 -0800
-
-    Suppress the check for ' as a formatting character on Windows.
-    
-    Change-Id: I006359faeeeb5d01ecdb57878c599c5e8a93a77f
-    Reviewed-on: https://code.wireshark.org/review/6319
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit fc39b9b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jan 4 17:43:19 2015 -0800
-
-    In CMake, check for thousands-grouping support in the GLib printf routines.
-    
-    We do that with the autotools; do it with CMake as well.
-    
-    We could, in theory, handle thosands-grouping ourselves, on all
-    platforms supporting ANSI C (for which read "all platforms we care
-    about") by using localeconv()'s thousands_sep and grouping items, but
-    that's a bit more work.
-    
-    Fix autotools' comment for that item while we're at it (it checks the
-    GLib printf routines, not the system printf routines).
-    
-    Change-Id: I000f0f3b955d9b192ade15e3fabc46d6b48a052e
-    Reviewed-on: https://code.wireshark.org/review/6317
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 533f857
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jan 4 16:31:49 2015 -0800
-
-    Don't check for nl80211 stuff if we don't have libnl.
-    
-    While we're at it, do the checks in the same order that we do in
-    autotools.
-    
-    Change-Id: Ie253cdeb740a5be4a5817ce4f7ed683aeea868c8
-    Reviewed-on: https://code.wireshark.org/review/6316
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 8fe6b04
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jan 4 16:25:51 2015 -0800
-
-    Note why we only default to enabling libnl on Linux.
-    
-    (Just as we note why we only check for it on Linux in autotools.)
-    
-    Change-Id: I58c1f31fdf667ed554a4e911df13e5c864171ac0
-    Reviewed-on: https://code.wireshark.org/review/6315
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 05fd11e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jan 4 16:11:56 2015 -0800
-
-    Add a check for NL80211_PROTOCOL_FEATURE_SPLIT_WIPHY_DUMP.
-    
-    Just as we check for it in autotools, check for it in CMake.
-    
-    Change-Id: I342a3fcde6a5f8190dac67260f25c070b6f5430f
-    Reviewed-on: https://code.wireshark.org/review/6314
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2f1ac87
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jan 4 14:10:56 2015 -0800
-
-    Clean up handling of INET6.
-    
-    We wire it on, so we don't need a commented out wiring-it-on on Windows.
-    
-    Explain *why* we're wiring it on rather than doing checks for IPv6
-    support.
-    
-    Change-Id: I205ba2456160f9dad48041f27c63a09cdcdc12d3
-    Reviewed-on: https://code.wireshark.org/review/6313
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 553cdfd
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jan 4 13:19:47 2015 -0800
+commit aea0023
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Jul 5 16:19:33 2016 +0200
 
-    No need to #define HAVE_PYTHON.
-    
-    We don't check it (we don't support Python as an extension language -
-    the experimental support was dropped).
+    tap: check return value (CID 1355643).
     
-    Change-Id: Iedbe1dc5095614676c7eb3026d02f421bdba0d1d
-    Reviewed-on: https://code.wireshark.org/review/6312
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I03b141c7aeaa1bc06dc126c5cc8f0d001a57c116
+    Reviewed-on: https://code.wireshark.org/review/16302
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit fac8356
-Author: Hadriel Kaplan <hadriel@128technology.com>
-Date:   Mon Dec 29 00:21:15 2014 -0500
+commit d7c072d
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Mon Jul 4 22:49:32 2016 +0200
 
-    Make all Lua code use wmem not emem
+    Qt: remove unused variable.
     
-    Changed all remaining code in wslua that was using emem, to use wmem or
-    simpler methods.
+    This fixes CID 1232347.
     
-    Bug: 9927
-    Change-Id: I3d19a770e0fd77d996bdb6b61a76a722cc2bcd55
-    Reviewed-on: https://code.wireshark.org/review/6109
+    Change-Id: I42b5ac997dbde8fcb05665b24444a60b009871be
+    Reviewed-on: https://code.wireshark.org/review/16290
     Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 5653fce
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jan 4 12:58:49 2015 -0800
+commit 7a3e9b1
+Author: Graham Bloice <graham.bloice@trihedral.com>
+Date:   Tue Jul 5 16:06:16 2016 +0100
 
-    No *pcap should have pcap_open() without the other remote extensions.
+    Developers Guide updates
     
-    WinPcap 3.0 introduced pcap_open(); it also introduced
-    pcap_findalldevs_ex() and pcap_createsrcstr().  If you're going to put
-    pcap_open() in libpcap, there's not much point to doing so but not also
-    putting pcap_findalldevs_ex() and pcap_createsrcstr() there.
-    
-    (And, in the future, there'll be support for remote capturing with
-    pcap_create() and pcap_activate(), with no need for pcap_createsrcstr(),
-    and a replacement for pcap_findalldevs() and pcap_findalldevs_ex(),
-    which we'll also check for.)
-    
-    So there's no need to check for pcap_findalldevs_ex() or
-    pcap_createsrcstr().
-    
-    Change-Id: I9323aad20136684d05d1e909326792a2f1408887
-    Reviewed-on: https://code.wireshark.org/review/6311
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 9aeb249
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Jan 4 18:47:40 2015 +0100
-
-    ACSE: get rid of an evil global variable
+    Added info about debugging under Visual Studio.
+    Updated buildbot info.
     
-    Bug: 10787
-    Change-Id: I225dab439e195bbd308bcafd4658e77ef9023c0f
-    Reviewed-on: https://code.wireshark.org/review/6263
-    Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: I9a6a0a2b14e3616a35f652c99b04ee23ea642ba5
+    Reviewed-on: https://code.wireshark.org/review/16307
+    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
 
-commit d9b480d
+commit bed9d18
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Jan 4 19:22:05 2015 +0100
+Date:   Tue Jul 5 16:21:01 2016 +0200
 
-    PKIX1Explicit: get rid of an evil global variable
+    Remove remnants of g_spawn_helper support
     
-    Bug: 10744
-    Change-Id: I9fbd7c881ab6b17fa9febb55a4f33dbb229c900b
-    Reviewed-on: https://code.wireshark.org/review/6264
-    Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I88121a280ff01a889daeda438b308380b6ea0703
+    Reviewed-on: https://code.wireshark.org/review/16303
     Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit d16f114
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Dec 24 22:12:17 2014 -0500
-
-    Convert "FC Member Identifier" fields from all strings to their "native" formats.
-    
-    Change-Id: I7ea32170b1cdcbc16c1d62b1069c4ed71ea6e9bb
-    Reviewed-on: https://code.wireshark.org/review/6099
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d3581ae
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Jan 2 14:06:42 2015 -0800
-
-    Make sure we don't underrun a buffer when decrypting SSL.
-    
-    Discovered by Noam Rathaus.
-    
-    Change-Id: Ia0275601b2a825ba616656064d9a6eca109e34fa
-    Reviewed-on: https://code.wireshark.org/review/6256
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit ac52f0e
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Jan 3 20:26:08 2015 +0100
-
-    SCTP (Graph Dialog Qt): fix Copy-paster error (CID 1158585)
-    
-    Change-Id: I8939dbc8339284f9a1e515aff533d67ddbb6d469
-    Reviewed-on: https://code.wireshark.org/review/6274
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit c2f6ce7
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Dec 24 15:30:03 2014 +0100
+commit d245698
+Author: Roland Knall <roland.knall@br-automation.com>
+Date:   Tue Jul 5 16:01:10 2016 +0200
 
-    TCP: Update Multipath TCP (MPTCP) to final RFC (RFC 6824)
+    openSAFETY: Add byte offset of frame
     
-    * Add Fast Close subtype
-    * Sender MAC => Sender HMAC
-    * Display some reserved field
-    * Add new flag (Checksum, Extensibility, HMAC-SHA1...) from MP Capability subtype
-    * Use also proto_tree_add_bitmask for flag
+    Add the absolute byte offset of each openSAFETY frame to
+    dissection, so a change in the offset can be easily detected
     
-    Change-Id: I2e4dfd75623d3218c574e3a112e799666adcc377
-    Reviewed-on: https://code.wireshark.org/review/6034
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: Ib935eff7ba1e2e1169cb9071a5c9703cc58fc123
+    Reviewed-on: https://code.wireshark.org/review/16301
+    Petri-Dish: Roland Knall <rknall@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit f648247
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Jan 4 18:43:57 2015 +0100
-
-    Get rid of warning: comma at end of enumerator list [-Wpedantic]
-    
-    Change-Id: I8faca065e1afff6d4d29b9b96c1b0f0b135163a7
-    Reviewed-on: https://code.wireshark.org/review/6306
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 4a94374
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Jan 4 18:33:22 2015 +0100
-
-    Fix linkage on Windows machine
-    
-    Change-Id: I24c8670fdf0910c3324fcfa8db8a8dbaad1dfbba
-    Reviewed-on: https://code.wireshark.org/review/6305
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit ff01bc6
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Dec 19 20:28:05 2014 +0100
-
-    gtk: fix crash when moving columns
-    
-    When the columns are moved, the packet list is redrawn from the
-    columns-changed signal handler. Apparently GTK does not like that the
-    parent contains got destroyed.
-    
-    Call packet_list_recreate outside the callback to workaround this issue.
-    Since the signal handler is blocked, it can never be called twice (and
-    there will always be at most one packet_list_recreate_delayed
-    scheduled).
-    
-    Bug: 10795
-    Change-Id: Ia97d330c8bef747809fa09a8709a19cb03c7e00a
-    Reviewed-on: https://code.wireshark.org/review/5881
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 553da37
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Jan 3 21:56:16 2015 -0500
-
-    Create BASE_DOT, BASE_DASH, and BASE_SEMICOLON types for the FT_BYTES field type.
-    
-    These "bases" will put a ".", "-", or ":" respectively between hexidecimal bytes in the field in packet view and display filter.  FT_BYTES with BASE_NONE will have no separator in the packet view, but continue to have the ':' as a separator in the display filter.
-    
-    Converted the "string" hf_ entries that used tvb_fc_to_str as a string to use proto_tree_add_item with FT_BYTES/BASE_DOT type.
-    
-    Converted applicable tvb_bytes_to_ep_str_punct() calls to use the new BASE values.
-    
-    Change-Id: I2442185bb314d04a3ff2ba57883652ecd738b5f9
-    Reviewed-on: https://code.wireshark.org/review/6098
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2085bbe
-Author: Sylvain Munaut <tnt@246tNt.com>
-Date:   Sun Jan 4 16:57:10 2015 +0100
-
-    gmr1_rach: Update dual-values fields to use true_false_string
-    
-    Change-Id: I87f2be4b28f6409e525afc36e8ed834fae3befbb
-    Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
-    Reviewed-on: https://code.wireshark.org/review/6300
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 84e43d9
-Author: Sylvain Munaut <tnt@246tNt.com>
-Date:   Sun Jan 4 16:46:12 2015 +0100
-
-    gmr1_rach: Add support for GmPRS/GMR-1 3G Channel Request Type 1 & 2
-    
-    Those are related to the Packet Data service.
-    
-    Change-Id: Ia8e9732901609e1cdad38558aac4a2f3475a0a9d
-    Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
-    Reviewed-on: https://code.wireshark.org/review/6291
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 1cd9d02
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Jan 4 08:05:05 2015 -0800
-
-    [Automatic manuf, services and enterprise-numbers update for 2015-01-04]
-    
-    Change-Id: Id1c008d9bbce7d9fdf8b1d2ec7d382e9d205db17
-    Reviewed-on: https://code.wireshark.org/review/6301
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Reviewed-by: Roland Knall <rknall@gmail.com>
 
-commit dbcb0b5
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Jan 4 12:51:21 2015 +0100
+commit 5cc5ba6
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Mon Jul 4 22:53:21 2016 +0200
 
-    stats tree plugin: fix no previous prototype for 'plugin_register_tap_listener' [-Wmissing-prototypes]
+    Qt: add initializers (CID 1233100).
     
-    Change-Id: If8ea78b9aceb9dbd7f2103aa141b57715188ff4f
-    Reviewed-on: https://code.wireshark.org/review/6297
+    Change-Id: I99e0d6bd10cc0faddb8a503ec877b3d03b927f4e
+    Reviewed-on: https://code.wireshark.org/review/16293
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit b0b51dd
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Jan 3 20:47:53 2015 +0100
-
-    GTPv2: fix Logically dead code (CID 1250813)
-    
-    Change-Id: I1761af90bd85b14e6021a5d7b07686a37593a152
-    Reviewed-on: https://code.wireshark.org/review/6279
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit fa0ebfc
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Jan 4 13:14:50 2015 +0100
+commit 5c11909
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Mon Jul 4 22:58:41 2016 +0200
 
-    BACAPP: fix empty paragraph passed to '@param' command [-Wdocumentation]
+    Qt: add initializers (CID 1249475).
     
-    Change-Id: Ibef3cee6930dea08fc7a87635c48de609d3d4015
-    Reviewed-on: https://code.wireshark.org/review/6299
+    Change-Id: Ic001c0dfab1e82c66473d6ca15633aaa57520659
+    Reviewed-on: https://code.wireshark.org/review/16294
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 83ac5b7
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Jan 3 20:44:06 2015 +0100
-
-    GTPv2: fix Logically dead code (CID 1255924)
-    
-    Change-Id: Ia21d8f68b5d898b4493da8cf948ad421f94234fc
-    Reviewed-on: https://code.wireshark.org/review/6278
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 98ba630
-Author: Sylvain Munaut <tnt@246tNt.com>
-Date:   Sat Jan 3 01:36:19 2015 +0100
+commit 0b35075
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Mon Jul 4 22:41:01 2016 +0200
 
-    gmr1_rach: Fixup the MOC Dialled Number decoding
-    
-    Turns out the special values 1023/1022/1021 can happen in any group
-    and not just the last one.
+    dis: cast to guint64 to avoid potential overflow (CID 1214480).
     
-    The last one is still special though with codes [1100->1209] being
-    exclusive to it.
-    
-    Change-Id: If86d0260aaa2cc1215560b89d7fc57d7ef21f082
-    Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
-    Reviewed-on: https://code.wireshark.org/review/6290
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Change-Id: I24ae4a7a5ef8b4ed363ec849ac9c8aeeefe836dd
+    Reviewed-on: https://code.wireshark.org/review/16288
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit a22ea3d
-Author: Sylvain Munaut <tnt@246tNt.com>
-Date:   Sat Jan 3 10:50:28 2015 +0100
-
-    gmr1_rach: Update NULL GPS position decoding with reality
-    
-    The spec doesn't always match 100% reality. In this case it seems some
-    manufacturer implemented NULL GPS position with longitude.
-    
-    Change-Id: I0c09627d64814a9467ecbecdc18e43974e4bab4a
-    Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
-    Reviewed-on: https://code.wireshark.org/review/6289
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit a16ac8f
-Author: Sylvain Munaut <tnt@246tNt.com>
-Date:   Fri Jan 2 14:38:25 2015 +0100
-
-    gmr1_rach: Use FT_INT24 instead of FT_UINT24 for latitude/longitude
-    
-    No need to do sign extension manually, the core code now supports
-    signed integers with bitmask and it will do the sign extension.
-    Not sure if that was always the code, but it works now.
-    
-    This also have the advantage that the real value 'seen' by wireshark
-    when applying filters is the real signed value.
-    
-    Change-Id: I47e2357e5556160a00110ad63e3342879769a0b9
-    Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
-    Reviewed-on: https://code.wireshark.org/review/6288
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 7c9d6ff
-Author: Hadriel Kaplan <hadrielk@yahoo.com>
-Date:   Sat Jan 3 19:27:59 2015 -0500
+commit f2786bc
+Author: Roland Knall <rknall@gmail.com>
+Date:   Tue Jun 28 21:34:46 2016 +0200
 
-    Lua: replace proto_tree_add_text calls
+    extcap: Remove g_spawn_helper support
     
-    Replace proto_tree_add_text() calls in Lua API code, to use Lua-specific hfinfo items.
+     Move g_spawn to separate file and implement functions to
+     use Windows based method of spawning, instead of the glib
+     based version
     
-    Bug: 10828
-    Change-Id: I9b5899106502a9bdbc748b5ec0f27b787d374562
-    Reviewed-on: https://code.wireshark.org/review/6296
-    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    Change-Id: Ibae03d834ec86531eba37dc8768fbf17ddadf57f
+    Reviewed-on: https://code.wireshark.org/review/16049
+    Petri-Dish: Roland Knall <rknall@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 2ef85f5
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Jan 3 19:29:05 2015 +0100
-
-    WiFi Display: fix no previous prototype for ... [-Wmissing-prototypes]
-    
-    It is the revert of adb81f335d17a151361f00001e125480eeaf7bc5
-    
-    Change-Id: I7a19ff175ca1ab59d0d0d9e89b3b3e6e12de3b96
-    Reviewed-on: https://code.wireshark.org/review/6273
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
+    Reviewed-by: Roland Knall <rknall@gmail.com>
 
-commit aad1a81
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Sat Jan 3 20:52:54 2015 +0000
+commit fdd87a1
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Mon Jul 4 22:41:29 2016 +0200
 
-    Fix out-of-tree build includes of config.h
-    
-    If a file in the same directory as config.h, e.g. wireshark-qt.cpp
-    has a #include "config.h", or another header it includes also has
-    a #include "config.h", then an out-of-tree build, e.g. CMake will
-    pick up any in-tree config.h and odd things may happen.  The correct
-    form is #include <config.h> which will pick up the out-of-tree
-    version.
-    
-    To find this, introduce a deliberate error and then make an out-of-tree
-    build, noting where it fails and fix that file.  If that file includes
-    other files that still cause the build to fail, set the compiler
-    to emit the pre-processed version so you can locate the include with
-    the next errant "config.h".  Repeat ad nauseum.
-    
-    Possibly all includes of "config.h" should be changed to <config.h>
-    
-    Revert "CMake: Clobber the top-level config.h before we build."
+    Network-Based IP Flow Mobility (NBIFOM) dissector
     
-    This reverts commit 1f3849ce614aeae5fda742beffe5558e7c2a8b71.
+    Based on 3GPP 24.161 V13.1.0
     
-    Ping-Bug: 10301
-    Change-Id: Ie567e7cc696fd48f3e730fc27032c5d2a7d8f341
-    Reviewed-on: https://code.wireshark.org/review/6285
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
+    Change-Id: I7bf635c862bf7e0b73fd05bc8a55c900d1f4dd87
+    Reviewed-on: https://code.wireshark.org/review/16291
+    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: Gerald Combs <gerald@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 9384854
+commit 308a538
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jan 3 14:35:01 2015 -0800
+Date:   Mon Jul 4 16:24:57 2016 -0700
 
-    Use g_strdup_printf(), rather than a fixed-length buffer, for the app name.
+    Style fix and trailing whitespace fix.
     
-    Add some missing g_free()s while we're at it.
-    
-    Change-Id: Id38acc21d3c0b337e5d05baaf5ebbcd63699ff50
-    Reviewed-on: https://code.wireshark.org/review/6287
+    Change-Id: I03a438fa58f84939f6245426cbe725e6196c2560
+    Reviewed-on: https://code.wireshark.org/review/16297
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 9df7386
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Jan 3 19:43:57 2015 +0100
+commit 6e91389
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Mon Jul 4 16:22:11 2016 -0700
 
-    It is also 2015 for Mac OS X :-)
+    Add a length check.
     
-    Change-Id: Idbd5e09ac80015feee7ddd30b9569219fde596e1
-    Reviewed-on: https://code.wireshark.org/review/6269
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Make sure the LBMR TNWG Interest record's length is at least the size of
+    a minimum-length LBMR TNWG Interest record.
+    
+    Hopefully this will fix the real problem about which CID 1363025 is
+    complaining.
+    
+    Change-Id: I60d94a054ec1ba4fb32b0cdd361995a584fe74a6
+    Reviewed-on: https://code.wireshark.org/review/16296
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 9ab44b3
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Jan 3 19:43:24 2015 +0100
+commit 240f605
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Mon Jul 4 22:47:27 2016 +0200
 
-    Info.plist : fix indent (use tabs)
+    Qt: add initializer (CID 1230901).
     
-    Change-Id: I241c124fa341ae5d6126a189374d69dea1a08d96
-    Reviewed-on: https://code.wireshark.org/review/6268
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: Ie7874ef90ce14978adb2c62f208dbcc2a636d3cf
+    Reviewed-on: https://code.wireshark.org/review/16289
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 760aa14
+commit 38c6a59
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jan 3 14:00:47 2015 -0800
+Date:   Mon Jul 4 14:14:58 2016 -0700
 
-    Use g_strdup_printf(), rather than a fixed-length buffer, for the app name.
+    Add length checks.
+    
+    Make sure the authentication trailer length is large enough for a
+    minimum-length authentication trailer.
+    
+    Hopefully this fixes the real problem reported by CID 1363027.
+    
+    Use proto_tree_add_item_ret_uint() while we're at it.
     
-    Change-Id: Ie6034e229f37278fce44b2fddad9250dfb5bc6c8
-    Reviewed-on: https://code.wireshark.org/review/6286
+    Change-Id: I3377f2a52a26f00eeb24ee5776853ffc6e4f7cce
+    Reviewed-on: https://code.wireshark.org/review/16295
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit dfa50e6
+commit 6b5d839
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jan 3 13:36:02 2015 -0800
+Date:   Mon Jul 4 13:52:20 2016 -0700
 
-    Use get_ws_vcs_version() to generate the version string.
+    Check to make sure the name length <= DLM3_RESNAME_MAXLEN.
     
-    That's what we do in, for example, dumpcap.
+    If it's not, we'd misdissect it.
     
-    Also, use g_strdup_printf() for the strings, rather than using
-    fixed-length arrays.
+    Hopefully this fixes the *real* problem that CID 1363031 was complaining
+    about.
     
-    Change-Id: I36ad201e3eda903ef3a089bafb09df0581efe512
-    Reviewed-on: https://code.wireshark.org/review/6284
+    Change-Id: If1fc7c30f72d75b9dc047d7e475f78c9d5869943
+    Reviewed-on: https://code.wireshark.org/review/16292
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit a190c93
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Fri Jan 2 23:28:44 2015 +0000
+commit 7490ad4
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sun Jul 3 11:34:37 2016 -0400
 
-    Remove unnecessary includes from wiretap folder
+    packet-packetbb.c cleanup
     
-    Change-Id: I10d3057801673bc1c8ea78f144215869cc4b1851
-    Reviewed-on: https://code.wireshark.org/review/6217
-    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Change-Id: I2f6ab0bffca5aa4b021b46b930b55455e76b8a9f
+    Reviewed-on: https://code.wireshark.org/review/16284
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 1f3849c
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sat Jan 3 12:02:56 2015 -0800
+commit de90565
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sat Jul 2 21:21:54 2016 -0400
 
-    CMake: Clobber the top-level config.h before we build.
+    packet-tcap.c: Remove MEM_TCAPSRT
     
-    If you use the same source directory for in-tree Autotools or Nmake
-    builds and out-of-tree CMake builds you can end up with a conflicting
-    config.h a the top of your source tree. Try to remove it in CMake before
-    building our config.h
+    No need to duplicate memory allocation of hash tables to have a "debug copy".
+    Maybe a separate wmem allocator can be used within the dissector, but that
+    type of debugging shouldn't be in trunk source. Keep it on private branch
+    until it's working.
     
-    Ping-Bug: 10301
-    Change-Id: I7ebeb31c92022fd28cbfca05fdb6931ffa2d9cae
-    Reviewed-on: https://code.wireshark.org/review/6282
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I4bdd0f3d1b613f7ae79aa57ebb8e5c3293023253
+    Reviewed-on: https://code.wireshark.org/review/16282
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 4d3acd9
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Jan 3 17:59:54 2015 +0100
+commit 276db50
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Mon Jul 4 13:40:07 2016 -0700
 
-    tshark: dump port number when generating SCTP, TCP or UDP conversations
+    Add length checks.
     
-    Change-Id: Ie3cda43a4cfca06482f2cee09f33230d1535b77d
-    Reviewed-on: https://code.wireshark.org/review/6265
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    While scanning through the Prefix64 option, check to make sure we
+    haven't run past the end of the option.
+    
+    The Prefix64 option requires that the prefix length be <= 12, and, if
+    it's not, we end up with part of the prefix having a negative length.
+    Check to make sure that it is <= 12.
+    
+    While we're at it, use proto_tree_add_item_ret_uint(), update IETF
+    document references to use RFCs rather tha earlier I-Ds, and add
+    references for RFC 7220 and RFC 7225.
+    
+    Hopefully this fixes the *real* problem that CID 1363032 was complaining
+    about.
+    
+    Change-Id: I1592de31f1d4f4ed6e6cdc141516fb764f21d2fb
+    Reviewed-on: https://code.wireshark.org/review/16287
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit af35e89
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sun Jul 3 22:01:23 2016 +0200
+
+    .mailmap: Update some name...
+    
+    Change-Id: I755010e59d33bc771a3be06bd1f6da1bcd81d836
+    Reviewed-on: https://code.wireshark.org/review/16267
+    Reviewed-by: Eugene Exarevsky <eugene.exarevsky@dsr-company.com>
+    Reviewed-by: Anil Kumar K K <anilkumar911@gmail.com>
+    Reviewed-by: Jose Rubio <joserubiovidales@gmail.com>
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 17dcd95
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Jan 3 20:40:16 2015 +0100
+commit 2fbf611
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sun Jul 3 11:16:45 2016 -0400
 
-    IPv6: do not allocate tap data on stack
+    LTE PDCP: Replace a few g_malloc0 calls with wmem
     
-    Bug: 10780
-    Change-Id: I2526fb9a5a2dfd61b19dff5ba1b7902f77927f4a
-    Reviewed-on: https://code.wireshark.org/review/6276
+    Change-Id: I8bce527fcd2cf9feb77326a5e9fa6857218dda19
+    Reviewed-on: https://code.wireshark.org/review/16283
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 2f34ae9
+commit c0949bf
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jan 3 11:03:05 2015 -0800
-
-    Remove the testing stuff.
-    
-    The problem was probably that we had two competing config.h files, with
-    some source files including one of them and othe source files including
-    the other, with the nmake config.h defining HAVE_KERBEROS and
-    HAVE_MIT_KERBEROS and the CMake config.h defining neither, and with
-    wireshark-qt.cpp including the nmake config.h, so that it expected there
-    to be a read_keytab_file() routine, and
-    epan/dissectors/packet-kerberos.c including the CMake config.h, so that
-    it didn't define a read_keytab_file() routine.
-    
-    (If the CMake build is done out-of-tree, with its config.h file outside
-    the source tree, and the nmake build done in-tree, with its config.h in
-    the top-level source directory, wireshark-qt.cpp, in the top-level
-    source directory, might pick up the config.h in the same directory, but
-    epan/dissectors/packet-kerberos.c doesn't have a config.h in its source
-    directory and might pick up the config.h from the CMake build
-    directory.)
-    
-    Change-Id: I040126026c4101aca1264affc04e585fee89b87b
-    Reviewed-on: https://code.wireshark.org/review/6272
+Date:   Mon Jul 4 12:42:11 2016 -0700
+
+    Fix typo.
+    
+    Addresses CID 1363024.
+    
+    Change-Id: Ie365f77ca215293aa880a9063521d2c2d7de73c8
+    Reviewed-on: https://code.wireshark.org/review/16286
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit e133ba9
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Jan 3 18:06:33 2015 +0100
+commit 52559e9
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sat Jul 2 17:40:17 2016 -0400
 
-    tshark: dump port number when generating SCTP endpoints statistics
+    General cleanup of packet-ipsec.c
+    
+    Noticed some things working on bug 12567 that weren't related to bug.
     
-    Change-Id: I72b557f0d12ba7a8c13288399a97ef1634121f79
-    Reviewed-on: https://code.wireshark.org/review/6266
+    Change-Id: Ie9acbf85cad0899af18202415a40f392a3088ffa
+    Reviewed-on: https://code.wireshark.org/review/16249
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 0452f76
-Author: Anish Bhatt <anish@chelsio.com>
-Date:   Fri Jan 2 20:00:08 2015 -0800
+commit 1e8ed70
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sat Jul 2 16:08:58 2016 -0400
 
-    [PROFINET] Fix swapped MaintenanceRequired & MaintenanceDemanded bits
-    
+    Treat SPI field in ESP/SA configuration as string only if wildcards are used.
     
-    Bug: 10753
+    Otherwise convert the SPI field to a number, which allows more user
+    flexibility in SPI format.
     
-    Change-Id: Ib5522eba5c1d9107219ee2d70c96899ba6f22ca1
-    Reviewed-on: https://code.wireshark.org/review/6258
+    Bug: 12567
+    Change-Id: I646f0aeeeec4ca4302eb7d5172af9218e88b289f
+    Reviewed-on: https://code.wireshark.org/review/16248
     Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit e7c4241
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Fri Jan 2 18:06:58 2015 +0000
+commit 3f80490
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Thu Jun 30 23:32:27 2016 +0200
 
-    Fix Windows x64 CMake build
+    NHRP: Add option for source address in authentication extension.
     
-    Unfortunately Kerberos for Windows (kfw) has a different lib
-    name for x86 & x64.  Fix FindKERBEROS.cmake to check for both
-    lib names.
+    It seems that not all Cisco IOS implementations adhere to RFC2332
+    with respect to having the source address after the SPI in the
+    authentication extension. This change adds a preference to suppress
+    the interpretation of the bytes following the SPI as the source
+    address. The default is to adhere to the RFC.
     
-    Change-Id: I525df6de099d4e50322226317bda8d93d7a8dd23
-    Reviewed-on: https://code.wireshark.org/review/6246
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
+    Bug: 12569
+    Change-Id: I00d3c1b90ace54f16f0fe4704e6127a5c4881c82
+    Reviewed-on: https://code.wireshark.org/review/16231
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit d7c3edd
-Author: Hadriel Kaplan <hadrielk@yahoo.com>
-Date:   Thu Jan 1 21:34:16 2015 -0500
+commit 764b147
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Tue Jun 28 00:15:33 2016 +0200
 
-    Lua: replace deprecated functions
+    wslua: fail on tree:add(nil)
+    
+    It is unlikely that tree:add(nil) or tree:add(nil, tvb) represents a
+    valid invocation. Most likely the developer made a mistake and tried
+    something like:
+    
+        local pf_thing = ProtoField.string("some.thing", "Description")
+        some_proto.fields = { pf_thing }
+        ...
+            tree:add(some_proto.fields.thing, tvb())
     
-    Remove deprecated functions from Lua API code: tvb_length and
-    tvb_length_remaining. The calls to proto_tree_add_text() are
-    left in, as I have no idea what to replace them with. The calls
-    to ep_* are being left in, as they're removed by change-id
-    I3d19a770e0fd77d996bdb6b61a76a722cc2bcd55.
+    which should have been:
     
-    Bug: 10822
-    Change-Id: Ib0686f90be1edc892d3ecf401b91eb7484540b3e
-    Reviewed-on: https://code.wireshark.org/review/6247
-    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+        some_proto.fields = { thing = pf_thing }
+    
+    or:
+    
+            tree:add(pf_thing, tvb())
+    
+    Save the developer some pain and bail out early.
+    
+    Change-Id: I59fc04153f02bb186b47b763676a68bb0271df76
+    Reviewed-on: https://code.wireshark.org/review/16177
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 61c6fb8
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jan 3 03:06:53 2015 -0800
+commit cf508f8
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Sun Jul 3 22:04:38 2016 +0200
 
-    Remove the probes from packet-kerberos.c.
-    
-    None of HAVE_KERBEROS, HAVE_MIT_KERBEROS or HAVE_HEIMDAL_KERBEROS or
-    HAVE_LIBNETTLE defined when it's compiled.  So how is HAVE_KERBEROS
-    getting defined when wireshark-qt.cpp is compiled?
+    androiddump: fix leak (CID 1293387).
     
-    Change-Id: If238ff54aa4f0cda662c7a52d76e33363a77240d
-    Reviewed-on: https://code.wireshark.org/review/6262
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I27e167368575dfddf78c237723d20c8b790e5f15
+    Reviewed-on: https://code.wireshark.org/review/16268
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
 
-commit 544ed8a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jan 2 23:41:28 2015 -0800
+commit 81a81fb
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Sun Jul 3 22:56:28 2016 +0200
 
-    Stick some #define probes in on Windows.
+    Qt: add initializers (CID 1159363).
     
-    Let's try to figure out why, on the 64-bit Windows build,
-    wireshark-qt.cpp is being compiled to call read_keytab_file() but
-    packet-kerberos.c is not being compiled to define it.
+    Change-Id: I5d8c2c847c842ddc172d26a3c8aee5d877201a4d
+    Reviewed-on: https://code.wireshark.org/review/16276
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+
+commit 85ed737
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Sun Jul 3 22:50:47 2016 +0200
+
+    Qt: add initializer (CID 1159361).
     
-    Change-Id: I782406e2189819d9400b84b6632fe0fb62c5996d
-    Reviewed-on: https://code.wireshark.org/review/6261
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ib7b66b4e1d600048b8a66b47d035c27ef126da29
+    Reviewed-on: https://code.wireshark.org/review/16275
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 16fe32f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jan 2 20:06:34 2015 -0800
+commit 5f69a2f
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Sun Jul 3 22:46:33 2016 +0200
 
-    Temporarily #if 0 out the call to read_keytab_file().
+    Qt: add initializer (CID 1159360).
     
-    If this fixes the Win64 build, somehow HAVE_KERBEROS is getting defined
-    when this is built but we're not actually building read_keytab_file in
-    packet-kerberos.c.
+    Change-Id: I0ade3925497022d5ac16e66c02727be7fd9f4aa5
+    Reviewed-on: https://code.wireshark.org/review/16274
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+
+commit 21a0fdc
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Sun Jul 3 22:43:05 2016 +0200
+
+    Qt: add initializers (CID 1159359).
     
-    If that *doesn't* fix the Win64 build's failure to find
-    read_keytab_file(), something Really Weird is going on, because nobody
-    should be looking for it.
+    Change-Id: I21de7d1b5f69bdcfa91da560abc262906d412777
+    Reviewed-on: https://code.wireshark.org/review/16273
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+
+commit 8aa2e87
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Sun Jul 3 22:40:11 2016 +0200
+
+    Qt: add initializer (CID 1159358).
     
-    Change-Id: If607e0eeeff854693cf9ce2ea1009d34a20a9992
-    Reviewed-on: https://code.wireshark.org/review/6259
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I3002015d793e48c87017571f8997dd5a78438f75
+    Reviewed-on: https://code.wireshark.org/review/16272
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 33ba8d3
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jan 2 16:27:24 2015 -0800
+commit 585cff2
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Sun Jul 3 22:37:42 2016 +0200
 
-    Support -K iff HAVE_KERBEROS is defined.
+    Qt: add initializers (CID 1159357).
     
-    This *shouldn't* make a difference, but it's a bit clearer, and, if it
-    *does* make a difference with some build, there's a bug in the
-    configuration process for that build.
+    Change-Id: I27d561d8d63e0d15f7811dd7a033c38df17dfb36
+    Reviewed-on: https://code.wireshark.org/review/16271
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+
+commit 9579d17
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Sun Jul 3 22:34:50 2016 +0200
+
+    Qt: add initializer (CID 1159355).
     
-    Clean up indentation while we're at it.
+    Change-Id: If2504ea4a9d806005a6d7631ec4645df1af0206a
+    Reviewed-on: https://code.wireshark.org/review/16270
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+
+commit e865db4
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Sun Jul 3 22:31:32 2016 +0200
+
+    Qt: add initializer (CID 1159354).
     
-    Change-Id: I94aa6d565c3d5545620a7aeeaabce03153ec5e1c
-    Reviewed-on: https://code.wireshark.org/review/6257
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I0aa4b9db902d084fe33eff5b69ac5cdc85c3fec8
+    Reviewed-on: https://code.wireshark.org/review/16269
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit d1d5bf1
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Jan 2 12:19:10 2015 -0500
+commit d439525
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Jul 3 16:04:19 2016 +0200
 
-    Replace proto_tree_add_text in dissector header files where it was used in a macro that should be expert info.
+    ssh: wmem_strdup() never returns NULL
     
-    Change-Id: I045368a0a91586231fc4b1e2700c2275088b76af
-    Reviewed-on: https://code.wireshark.org/review/6244
+    Change-Id: I2f7b01e5a71f043e49305d0e2a3e78eaa5eae0a8
+    Reviewed-on: https://code.wireshark.org/review/16262
     Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 5eecf81
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jan 2 13:17:15 2015 -0800
+commit 79fb9fd
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Jul 3 08:07:30 2016 -0700
 
-    Don't define a stub read_keytab_file() on Windows if we don't have Kerberos.
+    [Automatic update for 2016-07-03]
     
-    We don't declare it, so all the DLL export stuff won't work, and we
-    shouldn't need it, as we shouldn't be calling it if we don't have
-    Kerberos (we shouldn't support the -K option if we don't have Kerberos,
-    for example).
+    Update manuf, services enterprise-numbers, translations, and other items.
     
-    Change-Id: I7e7b12aa93c4f31953300ef513fc09a1f55f8aef
-    Reviewed-on: https://code.wireshark.org/review/6255
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ie8e9bf51a9c25c6693597ba1109c221a111e3b58
+    Reviewed-on: https://code.wireshark.org/review/16264
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 970e7c1
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Jan 2 12:33:49 2015 -0800
+commit ce52309
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Jul 3 16:39:20 2016 +0200
 
-    Try to clarify the PowerShell requirements.
+    iso14443: expert info if the crc is wrong
     
-    Change-Id: Ie4ad0388b920ba4a8483ad8af351ddbdd121a28b
-    Reviewed-on: https://code.wireshark.org/review/6254
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I1b59a7d7bf0f9f304f816558f38ce5d52deb504e
+    Reviewed-on: https://code.wireshark.org/review/16263
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit 42baa9d
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Jan 2 21:02:13 2015 +0100
+commit 2da35bc
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Jul 3 13:37:51 2016 +0200
 
-    USB HID: fix report descriptor main items dissection
+    profinet, CID 1362120: check the return value of ftell()
     
-    true_false_string definitions were inverted
-    While we are at it, use the exact same wording as in the spec
+    change filePosRecord's data type to long, this is what ftell() and
+    fseek() expect
     
-    Bug: 10825
-    Change-Id: Ia391b310e92eb88a9a144a2fb0974701a460afc8
-    Reviewed-on: https://code.wireshark.org/review/6251
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 7d943e1
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Jan 2 19:20:03 2015 +0100
-
-    Add back "version.h" inclusion
+    limit filePosRecord's scope to the block where it's actually used
     
-    It got removed by the automatic include cleaning scripts
-    Also add it to text2pcap.c as it is used to get the version when writing a pcapng file
+    if ftell() returns < 0, don't move the file pointer and don't call
+    fseek() with the negative offset
     
-    Change-Id: I3d56985fa1d04bcb066fe015a588c24cf3cb7267
-    Reviewed-on: https://code.wireshark.org/review/6248
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: If5a43099c32e476a691f4d6cd26ed7fb73490fcf
+    Reviewed-on: https://code.wireshark.org/review/16258
+    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit b90f784
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Jan 2 12:34:21 2015 -0500
+commit 50614a9
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sun Jul 3 13:17:41 2016 +0100
 
-    Add sanity check to ensure integer types don't get set to BASE_NONE.
+    checkhf: Use colon as field separator for better readability
     
-    This is checked by Wireshark, but the script should catch it earlier in case Wireshark/TShark isn't run after the script is executed (a mistake I've made several times).
+    Comma looks like a list when skimming quickly.
     
-    Change-Id: I1d113871b10fcae5a6d3e9036cc80d7b1ec1ae57
-    Reviewed-on: https://code.wireshark.org/review/6245
+    Change-Id: Ic0ac1bc8746c70724d2279e3d725c5c9449b79d8
+    Reviewed-on: https://code.wireshark.org/review/16260
+    Reviewed-by: João Valverde <j@v6e.pt>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit e7d0cdc
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Fri Jan 2 13:12:17 2015 +0000
+commit ff7d0b3
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sun Jul 3 12:58:24 2016 +0100
 
-    Fix lua tests on Windows
+    ICMPv6-RPL: Fix DRO-ACK reserved field.
     
-    Convert TEST_DIR path to a Windows path, this is used in all the lua tests.
-    Fix a typo
+    Unused href entry: epan/dissectors/packet-icmpv6.c, hf_icmpv6_rpl_p2p_droack_flag_reserved
     
-    Change-Id: I38808822c998ed1df007732b3701b6b13d6c886b
-    Reviewed-on: https://code.wireshark.org/review/6235
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
+    Change-Id: I2fb74946aeb7cf1df708449c185126ee7b6b0253
+    Reviewed-on: https://code.wireshark.org/review/16259
+    Reviewed-by: João Valverde <j@v6e.pt>
 
-commit a3c705a
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Fri Jan 2 11:24:30 2015 -0500
+commit 6d4c976
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Jul 3 13:42:40 2016 +0200
 
-    mux27010: Add a link to info about the mux27010 packet structure.
+    profinet: add a space to make checkhf happy
     
-    Change-Id: I46f8efc8c95bf4501a631ef3adc5291939ab1497
-    Reviewed-on: https://code.wireshark.org/review/6240
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit 887d198
-Author: Evan Huus <eapache@gmail.com>
-Date:   Fri Jan 2 11:11:21 2015 -0500
-
-    test: improve check for out-of-tree tests
+    without the space, checkhf complains about an ei entry
     
-    Rather than running `cd` and letting it potentially fail, just use the `-d` flag
-    to test that `run` exists and is a directory. Avoids useless stderr output.
+    martin@reykholt:~/src/wireshark.git$ ./tools/checkhf.pl plugins/profinet/packet-dcerpc-pn-io.c
+    ERROR: NO ARRAY: plugins/profinet/packet-dcerpc-pn-io.c, ei_pn_io_unsupported
     
-    Change-Id: Iab8b63681db6256aa1a6fc389d2536acbd491aba
-    Reviewed-on: https://code.wireshark.org/review/6239
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: Ie72efcec644225bc4f554117ae10672694823cad
+    Reviewed-on: https://code.wireshark.org/review/16257
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit 5cb96a0
-Author: Evan Huus <eapache@gmail.com>
-Date:   Fri Jan 2 11:07:28 2015 -0500
+commit 4562a70
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sat Jun 18 16:35:26 2016 -0700
 
-    test: default WS_QT_BIN_PATH to WS_BIN_PATH
-    
-    it used to be SOURCE_DIR, which is still the fallback for WS_BIN_PATH, but this
-    way if you specify a custom WS_BIN_PATH it gets picked up for both
+    dns: remove a bunch of unnecessary NULL checks
     
-    Change-Id: If9198565fc7b7b3911550fd200adb0f918622540
-    Reviewed-on: https://code.wireshark.org/review/6238
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: Ia4066ae3fc31fb43d4cc63cfb739f22738581831
+    Reviewed-on: https://code.wireshark.org/review/16256
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit 1c7ffed
-Author: Evan Huus <eapache@gmail.com>
-Date:   Fri Jan 2 10:48:19 2015 -0500
+commit 0bc3d75
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sun Jul 3 09:47:22 2016 +0000
 
-    ositp: fix some BASE_ errors from g7935ba9f5be
+    Revert "Support for NSH with VXLAN-GPE encapsulation"
     
-    Change-Id: I71639f95f8efff9619e00dae45763ff863f0ca21
-    Reviewed-on: https://code.wireshark.org/review/6237
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    This reverts commit 76a8bca9bc87823e9182fa6ebb35f0b93bcc451b.
+    
+    Change-Id: I85b9778329373872e4f9fd1b90280dfef5e33a06
+    Reviewed-on: https://code.wireshark.org/review/16255
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 27fa202
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Wed Nov 5 21:00:26 2014 +0100
+commit 783bb5b
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sun Jul 3 01:29:04 2016 +0100
 
-    Make it easier to run tests out of tree.
+    Fix indentation
     
-    Change-Id: I4ed10339d3c543d9d199e5262b6e7bb8247544ac
-    Reviewed-on: https://code.wireshark.org/review/5148
+    Change-Id: I41b9cf4b7e3efbee48174fe0151ca94cb0bbc425
+    Reviewed-on: https://code.wireshark.org/review/16254
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
     Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 7935ba9
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Jan 1 19:05:06 2015 -0500
+commit 1464261
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sun Jul 3 01:26:32 2016 +0100
 
-    Eliminate proto_tree_add_text from packet-ositp.c
+    ICMPv6: Avoid "no response found" for multicast ping
     
-    Change-Id: If97f1b17bf8dbd6bac708b7dfbef6df73fad0f30
-    Reviewed-on: https://code.wireshark.org/review/6218
+    Change-Id: Ia6bfdd28fc6d85b3899d542db5aa4ed54be054ea
+    Reviewed-on: https://code.wireshark.org/review/16253
     Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 3cc6aee
-Author: Hadriel Kaplan <hadrielk@yahoo.com>
-Date:   Thu Jan 1 21:16:40 2015 -0500
+commit 32e8f07
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sun Jul 3 00:31:38 2016 +0100
 
-    Lua: regex test suite fails with UTF-8 locale
-    
-    Due to the change in change-id Ib43e16a9d98d08e5ddaff81fd3235f5b64d7b95b, the setlocale() call has been moved earlier in tshark's processing, such that Lua plugins load with the environment locale instead of C-locale. Since that matches Wireshark's behavior, it's good, but it causes the Lua regex test suite to fail. So the test suite needs to be fixed.
+    ICMP: Avoid "no response found" for multicast ping
     
-    Bug: 10824
-    Change-Id: I3dcad15a9e247a1e42d2f708ccfb7272de2fe960
-    Reviewed-on: https://code.wireshark.org/review/6226
-    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
+    Ping-Bug: 12581
+    Change-Id: I6943d275de988e9de66bc01e2b421901947a5b95
+    Reviewed-on: https://code.wireshark.org/review/16252
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 55c385e
-Author: Evan Huus <eapache@gmail.com>
-Date:   Wed Dec 31 17:05:58 2014 -0500
+commit 791c93f
+Author: Adrian Simionov <daniel.simionov@gmail.com>
+Date:   Sat Jul 2 22:49:44 2016 +1000
 
-    tvb: implement endianness-paramterized getters
-    
-    e.g. tvb_get_guint16(tvb, offset, ENC_LITTLE_ENDIAN)
+    DOCSIS: Update to Type 35 UCD
     
-    Change-Id: Iea02fd59b13678aca741d028fb1f66f334447498
-    Reviewed-on: https://code.wireshark.org/review/6191
+    Change-Id: Ie0dda94894cfaec9bccbd69d52367034e1c629da
+    Reviewed-on: https://code.wireshark.org/review/16242
     Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit 76a8bca
+Author: sjha3 <sjha3@ncsu.edu>
+Date:   Sat Jul 2 19:09:50 2016 -0400
+
+    Support for NSH with VXLAN-GPE encapsulation
+    
+    Bug: 12271
+    Change-Id: I8481c4ab69c4432985acc79bff7818e6857fa1cb
+    Reviewed-on: https://code.wireshark.org/review/16251
     Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 611cfd0
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jan 1 19:54:34 2015 -0800
+commit 3d7b817
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Sat Jul 2 23:16:11 2016 +0200
 
-    Always set decrypt_len when setting decrypt.
-    
-    This may not always be necessary, but....
+    Qt: add initializer (CID 1159352).
     
-    Change-Id: Ib409839dbee0574c516568a1f43793f8b407f611
-    Reviewed-on: https://code.wireshark.org/review/6232
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ie355a31284685ca0c160a46a4daa6c28b39e3093
+    Reviewed-on: https://code.wireshark.org/review/16247
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit a621bb7
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Fri Jan 2 03:49:10 2015 +0000
+commit 794da62
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Sat Jul 2 23:05:24 2016 +0200
 
-    Revert "Bring pkg.m4 in from pkgconfig version 0.28 so we can use the PKG_PROG_PKG_CONFIG macro to try searching for pkg-config even when it isn't installed.  Without this (and without pkg-config installed) the configure script is broken.  With it, it gives a mes"
+    Qt: remove unneeded check (CID 1159309).
     
-    This reverts commit f94eb278624b5e5ff357ec7f943a16fb7ef2e61b.
+    fi has already been checked in line 51.
     
-    Change-Id: I1a74fa221bdb3d72e88a46ced64e0d434a8fe552
-    Reviewed-on: https://code.wireshark.org/review/6231
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
+    Change-Id: Idd4d09a35ef1d4897479538979debd708e2cfe5b
+    Reviewed-on: https://code.wireshark.org/review/16246
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 8541578
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jan 1 17:53:24 2015 -0800
+commit 3bb019f
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jul 1 10:35:22 2016 -0700
 
-    When deccoding base-64, the result is the length of the *decoded* result.
+    Qt: Fixup byte view context menus
     
-    That way, for example, format_text() calls on the decoded result don't
-    go past the end of the decoded result.
+    Shorten text similar to other context menus.
     
-    Fix some more indentation while we're at it.
-    
-    Bug: 10823
-    Change-Id: Ia7b7b1d9fb06af5df945f19a375bf5bef3277018
-    Reviewed-on: https://code.wireshark.org/review/6221
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I8806ed4dddb6fc3c51ddbd4150d9090f5b2ca787
+    Reviewed-on: https://code.wireshark.org/review/16238
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 5c529c9
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Thu Jan 1 20:41:49 2015 -0500
+commit 1f28e68
+Author: Matt Texier <matthieu@texier.tv>
+Date:   Wed Jun 29 17:33:21 2016 +0200
 
-    Add '*.nativecodeanalysis.xml' to 'clean' targets
+    BGP: Fixed an side effect of length coding on offset
     
-    Change-Id: I90dbf0b31fc737150a01533763a7869b34c68cb6
-    Reviewed-on: https://code.wireshark.org/review/6220
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Bug: 12568
+    Change-Id: Ibf063293041d749664f6e6ecd2455024ea3fd4ed
+    Reviewed-on: https://code.wireshark.org/review/16237
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 06a1f46
+commit 94e97e4
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Jan 1 19:56:03 2015 -0500
+Date:   Sat Jul 2 08:23:34 2016 -0400
 
-    Have hf variables outputted in the order they were found in the file.
+    packetbb: Prevent divide by 0.
     
-    Previously they were "randomly sorted" in the hash table.  The hf "array" is outputted in the order found, so have the hf variable declaration match.
-    
-    Change-Id: I4b078a6328ba7c2781f07bb41d701412fc74ba22
-    Reviewed-on: https://code.wireshark.org/review/6219
+    Bug: 12577
+    Change-Id: Ibfa605597b786d8dbf1e256ef2ca6dc691498974
+    Reviewed-on: https://code.wireshark.org/review/16241
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 454fd6e
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Thu Jan 1 19:45:22 2015 -0500
+commit b78dd09
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Mon Jun 27 14:45:03 2016 +0200
 
-    Add "Editor modelines"; Adjust whitespace as needed.
+    proto.c: allow calling get_hfi_length() with a 0 byte tvb and length=-1
     
-    Change-Id: Ic5a5acb0f36d3aa144edbfb1ae71097b18426db4
-    Reviewed-on: https://code.wireshark.org/review/6216
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit 887cce4
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Fri Jan 2 00:29:11 2015 +0000
-
-    Restore another include to try to fix solaris build
+    As indicated in the comment, we allow FT_PROTOCOL, FT_NONE, FT_BYTES, FT_STRING
+    and FT_STRINGZPAD to be zero-length.
+    But in that case do not call tvb_ensure_captured_length_remaining() that ensures
+    that at least 1 byte is  present.
     
-    Change-Id: I5b8dc27943297aae88c652be98d982f75ed9a3ee
-    Reviewed-on: https://code.wireshark.org/review/6215
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Bug: 12561
+    Change-Id: I881754368c24d334b88f0dda1d59a68e08219227
+    Reviewed-on: https://code.wireshark.org/review/16167
+    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: Anders Broman <a.broman58@gmail.com>
 
-commit 1c14f5b
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Fri Jan 2 00:15:40 2015 +0000
+commit 7ad9db8
+Author: dsrsupport <eugene.exarevsky@dsr-company.com>
+Date:   Fri Jul 1 13:22:09 2016 +0300
 
-    Restore inclusion of gui_utils.h  to pixmap_save.c
+    ZigBee Green Power: implement GP Pairing Configuration command dissection.
     
-    Change-Id: Ied83d36d8f56f8dc1550ff5ae68bc2b61ea6f1b6
-    Reviewed-on: https://code.wireshark.org/review/6214
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Change-Id: I539e98935699e5be8f91daaebade00f22b500dbc
+    Reviewed-on: https://code.wireshark.org/review/16235
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 860cb39
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Dec 30 23:26:19 2014 -0500
+commit cb987e8
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Fri Jul 1 11:27:52 2016 -0400
 
-    tshark: Add endpoints statistics
+    Don't leak a file descriptor when changing the SSL debug file name.
     
-    "stat name" has been official changed to "endpoints" for all dissectors, rather than a mixture of "host"/"endpoints" based on dissector.
+    I guess people don't change the SSL debug file name that often--this bug has
+    been here since 2006...
     
-    Change-Id: If34bcb5165b493948e784ba038ab202803a59843
-    Reviewed-on: https://code.wireshark.org/review/6154
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Change-Id: I3db053dd7e0cb9a9e4ae49a310e956b3c77c99f6
+    Reviewed-on: https://code.wireshark.org/review/16236
+    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 07c9492
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Dec 19 08:08:38 2014 -0500
+commit f3bd70b
+Author: Hessam Jalali <hessam.jalali@gmail.com>
+Date:   Thu Jun 30 21:41:15 2016 +0430
 
-    Remove pkt_comment member from packet_info structure.
+    fix missing fields for json, ek and pdml when used with -e fields
     
-    Change-Id: Ifd3d201a09944e3fc36188f891ea8a584886101d
-    Reviewed-on: https://code.wireshark.org/review/5884
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    
+    Description:
+    
+    when -T json,ed or pdml used in conjunction with -e fields they would
+    always miss  the last field.
+    
+    in case of json and ek, if some fields in the middle are empty,
+    the generated json would be invalid.
+    
+    sample for ek:
+    
+     {  "_index": "packets-2016-06-30",  "_type": "pcap_file",
+     "_score": null,  "_source":
+     {  "layers": {  "e212.mcc": ["255","262"]  "frame.time_epoch":
+     ["1426550400.004751510"],  "e212.mnc": ["1","1"]  }  }  }
+    
+    command:
+    
+    tshark -T ek -r C:\a.pcap -e e212.mcc -e frame.comment
+    -e frame.time_epoch -e e212.mnc > C:\test.json
+    
+    note:
+    
+    the comma is missing between e212.mcc and frame.time_epoch
+    
+    Change-Id: I2efae0c48036cf6313e2a064453c8dbc49f38b09
+    Reviewed-on: https://code.wireshark.org/review/16226
     Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Reviewed-by: Martin Kacer <kacer.martin@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit f384fa0
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jan 1 15:33:01 2015 -0800
+commit ad30999
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Wed Jun 29 23:18:57 2016 +0200
 
-    Fix tpyo.
+    Cleanup LAPD preferences and registration handoff routine
     
-    Change-Id: I5b190ee35086664ed053d376def4e21ab9ad9236
-    Reviewed-on: https://code.wireshark.org/review/6213
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2ce7dfe
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jan 1 15:27:53 2015 -0800
-
-    More indentation cleanups.
+    The preferences and the registration handoff routine used to handle
+    preference changes are setup inconsistent and less efficient. This
+    change cleans it up.
     
-    Change-Id: I6d21bda89f8032d302620e21ac393dc345165ac7
-    Reviewed-on: https://code.wireshark.org/review/6212
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I9a1d51d8924c30d9e86d8af394ab1f0f31da4d2d
+    Reviewed-on: https://code.wireshark.org/review/16208
+    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 6c24c7e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jan 1 15:14:51 2015 -0800
+commit a062c80
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Thu Jun 30 20:41:45 2016 -0400
 
-    Clean up indentation.
+    ASN.1 dissectors - don't try to find yourself.
     
-    Change-Id: I5aa6cafc6249b3a820b1bbf2eddc2ec1fdc88685
-    Reviewed-on: https://code.wireshark.org/review/6211
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    If an ASN.1 dissector is calling register_dissector for itself in its proto_register_xxx
+    function and then calling find_dissector for itself in its proto_reg_handoff_xxx
+    function then just create a static handle for that dissector and use the return
+    value of register_dissector, so the find isn't necessary.
+    
+    Change-Id: I911bdadc2fb4259601c141b955e741a2369cc447
+    Reviewed-on: https://code.wireshark.org/review/16233
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 43f09e6
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Thu Jan 1 23:09:08 2015 +0000
+commit d4add25
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Thu Jun 30 22:37:10 2016 +0200
 
-    Remove unneeded includes from ui folder
+    s7comm: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
     
-    Change-Id: Ifd1eebff9080cd3867e44e4dcb2d2681370ed60a
-    Reviewed-on: https://code.wireshark.org/review/6128
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Change-Id: I296d11ec43b3817d30920432239632f86b9f773f
+    Reviewed-on: https://code.wireshark.org/review/16227
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Thomas Wiens <th.wiens@gmx.de>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 5981dab
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jan 1 15:05:25 2015 -0800
+commit 250f248
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Jun 30 09:24:57 2016 -0700
 
-    Declare read_keytab_file() in epan/dissectors/packet-kerberos.h.
+    Qt: Add ASCII+EBCDIC actions to the byte view context menu.
     
-    Don't throw its declaration in file.h, as it's not defined in file.c.
-    Instead, include it in epan/dissectors/packet-kerberos.h and include
-    that wherever read_keytab_file() is called.
+    Add actions to switch between ASCII and EBCDIC, similar to the hex and
+    bits items.
     
-    Yes, that means you also have to include <epan/asn1.h> and, therefore,
-    you have to include <epan/packet.h>.  Yes, that should be cleaned up,
-    perhaps by splitting the Kerberos support code into "stuff that handles
-    encryption keys without any reference to dissection" and "stuff that
-    does dissection-related work".
-    
-    Change-Id: Ide5c31e6d85e6011d57202f728dbc656e36138ef
-    Reviewed-on: https://code.wireshark.org/review/6210
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Bug: 5298
+    Change-Id: Ib601ac6e89411e6482f3e4172726e16a08fdbd2b
+    Reviewed-on: https://code.wireshark.org/review/16225
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 445ddc8
-Author: Hadriel Kaplan <hadrielk@yahoo.com>
-Date:   Wed Dec 31 15:24:18 2014 -0500
+commit 5cf7fcd
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Jun 30 14:55:19 2016 -0700
 
-    Lua: FieldInfo '==' check isn't really equality
+    Qt+Gtk: Fix the -t command line flag.
     
-    The FieldInfo metamethod for equality (letting you use the '==' operator)
-    doesn't check for equality, but rather if the left-hand side is within
-    the right-hand side. It should be equality instead. Also, all of the
-    FieldInfo operate overloads should push a boolean even if they're false
-    result.
+    Add the time format to commandline_param_info_t and apply it when we've
+    finished application initialization.
     
-    Bug: 10820
-    Change-Id: Ibddaab29713f26d22ddb4d5804b9edb15e93fd79
-    Reviewed-on: https://code.wireshark.org/review/6186
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    Bug: 12489
+    Change-Id: Ice626198a610567e945a8e53c0c1093797e8208e
+    Reviewed-on: https://code.wireshark.org/review/16232
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 6d6ba64
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Thu Jan 1 12:21:36 2015 -0500
+commit f860e8d
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Thu Jun 30 23:04:37 2016 +0200
 
-    .gitignore: Add '*.nativecodeanalysis.xml'
+    exported_pdu(.h): Fix warning: parameter 'tag_type.' not found in the function declaration [-Wdocumentation]
     
-    Change-Id: I54133af8626125b51e4263d3c77358752bdcf339
-    Reviewed-on: https://code.wireshark.org/review/6209
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: Ic93914a7f526b645bc21a5c9c5f2fa0bf988c27e
+    Reviewed-on: https://code.wireshark.org/review/16230
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 7ed0cd7
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jan 1 10:28:06 2015 -0800
+commit 52ab7bb
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Thu Jun 30 22:42:26 2016 +0200
 
-    wireshark-qt.cpp belongs in, err, umm, the Qt Wireshark - not the GTK+ one.
+    802.11 radio: fix an out of bounds access
     
-    Change-Id: I101be1967f45bcb56d72784a456e394ca7e51323
-    Reviewed-on: https://code.wireshark.org/review/6208
+    Bug: 12571
+    Change-Id: I4dafdd9bdec5acddf346fd2db6a06d9dfabcbb2e
+    Reviewed-on: https://code.wireshark.org/review/16228
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 72f035d
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Jan 1 18:50:37 2015 +0100
+commit cd1ddf6
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Jun 29 16:51:37 2016 -0700
 
-    Qt: fix crash when opening Preferences window on Windows
+    Speed up print_line_text.
     
-    Do not use delete on g_allocated memory
+    isatty adds a small delay, at least on OS X. Call it only when we
+    allocate a stream. Do the same for our codeset check.
     
-    Change-Id: I84e0adc65c45520916adb9b2f6d46ca3f144486e
-    Reviewed-on: https://code.wireshark.org/review/6207
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: Id3a20059dbc9cf7d5db16d8d238d038b9de0ebf2
+    Reviewed-on: https://code.wireshark.org/review/16222
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 1663c2a
+commit 6b15251
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Jan 1 14:09:29 2015 +0100
+Date:   Thu Jun 30 17:40:44 2016 +0200
 
-    Welcome in 2015
+    NAS EPS: upgrade dissector to v13.6.0
     
-    Change-Id: Ib581b9383b211ea8dbcea1cadf98a2b8c3548ab5
-    Reviewed-on: https://code.wireshark.org/review/6204
+    Change-Id: Ie27ce7481b9730ad8da0d465ed1c2bc373d4b602
+    Reviewed-on: https://code.wireshark.org/review/16224
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit e8e38b4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jan 1 04:36:07 2015 -0800
+commit e594603
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Thu Jun 30 09:16:58 2016 -0400
 
-    wireshark-qt.cpp is only a Qt Wireshark source file.
+    Reinstate the wmem test-programs target.
     
-    It's not a GTK+ Wireshark source file, so don't include it in
-    wireshark-gtk.
+    It's used when building the test programs (today wmem has only one but it
+    might someday have more).
     
-    Change-Id: I0affa1fab1a29e10e1cf446e49182c9c4f218b87
-    Reviewed-on: https://code.wireshark.org/review/6203
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I627513e1297b8348bf034e852eaf212ddbef96ff
+    Reviewed-on: https://code.wireshark.org/review/16221
+    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>
 
-commit 6ef4cbd
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jan 1 04:16:05 2015 -0800
+commit b483f8d
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Jun 30 08:25:44 2016 -0700
 
-    Include "file.h" to get read_keytab_file() declared.
+    Add missing breaks.
     
-    Change-Id: I7e9ea47019f259a56a8652d0e003e23a3e1d1366
-    Reviewed-on: https://code.wireshark.org/review/6202
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Add a couple of missing breaks. Fixes CIDs 1362970 and 1362971.
+    
+    Change-Id: If37bcfed9b48ba30ce8ed85df6e232a6bc5d36f4
+    Reviewed-on: https://code.wireshark.org/review/16223
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 219d37e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jan 1 04:13:05 2015 -0800
+commit 9ed7568
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Jun 29 13:28:57 2016 -0700
 
-    Let routines from the Kerberos dissector be called from C++.
+    Recompress PNGs.
     
-    Wrap its declarations in the usual "extern "C"" stuff.
+    Recompress PNGs using the current versions of various compressors:
     
-    Change-Id: I353ab334bc08a69fdacaaab5672edf758b14766a
-    Reviewed-on: https://code.wireshark.org/review/6201
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+      optipng 0.7.6
+      advpng 1.20
+      advdef 1.20
+      pngcrush 1.8.1
+    
+    Parallelize PNG compression. Note why we're not using a couple of other
+    compression utilities.
+    
+    Change-Id: I52757d0bc2d424013e7f00b693a0f5378427cc31
+    Reviewed-on: https://code.wireshark.org/review/16209
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 0a64b55
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jan 1 03:28:48 2015 -0800
+commit a16d401
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Tue Jun 21 05:06:23 2016 +0100
 
-    Remove wireshark_cxx.
+    Remove Makefile.common files
     
-    It may have been part of the "build Qt Wireshark as C++" hacks, and is
-    now causing build problems.
+    Now that nmake build system has been removed they are not needed anymore.
     
-    Change-Id: If471bf3dca01f1bc6e9b5b871d0de3159e4c8e1c
-    Reviewed-on: https://code.wireshark.org/review/6200
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I88075f955bb4349185859c1af4be22e53de5850f
+    Reviewed-on: https://code.wireshark.org/review/16050
+    Petri-Dish: João Valverde <j@v6e.pt>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: João Valverde <j@v6e.pt>
 
-commit 8bf7078
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jan 1 01:19:57 2015 -0800
+commit f6c5cf9
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Thu Jun 30 00:29:31 2016 +0100
 
-    Move ui/qt/main.cpp to wireshark-qt.cpp, and get rid of the dummy.cpp hack.
+    SDP: Fix warnings [-Wcast-qual]
     
-    Change-Id: Ib4684264363593372b3bf078cf17cae1a1cb10d6
-    Reviewed-on: https://code.wireshark.org/review/6199
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I471c3d060ff69982e94c9046ca121bb0c15f0d74
+    Reviewed-on: https://code.wireshark.org/review/16212
+    Petri-Dish: João Valverde <j@v6e.pt>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
 
-commit a4019a3
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 31 21:02:46 2014 -0800
+commit 37c928f
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Jun 29 16:12:12 2016 -0700
 
-    Rename a variable to avoid a compiler warning.
+    Qt: Show the correct data in the packet dialog.
     
-    (Thanks, IBM and AT&T.)
+    Set our pointers and copy our data *after* we read our packet.
     
-    Change-Id: Ifcffd4937f90ca466c01ebc4f3e3bd8555a9b078
-    Reviewed-on: https://code.wireshark.org/review/6198
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Bug: 12556
+    Change-Id: I5b373f94ad5b2fa2e6563142200a80912e717a96
+    Reviewed-on: https://code.wireshark.org/review/16211
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
 
-commit 21697af
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Wed Dec 31 13:56:34 2014 +0000
+commit e55eaf5
+Author: Matt Texier <matthieu@texier.tv>
+Date:   Wed Jun 29 17:33:21 2016 +0200
 
-    Added DNP3 support for g13 and g43, output command events
+    BGP dissector: Fixing NLRI length for flow spec NLRI
     
-    Bug: 10347
-    Change-Id: Ic173f31d8cf3fd002454f4c22b85c19bae42d544
-    Reviewed-on: https://code.wireshark.org/review/6175
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Bug: 12568
+    Change-Id: Id2b89c2d133865771e21acf3ee224f57ac9d262b
+    Reviewed-on: https://code.wireshark.org/review/16203
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 889c566
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Dec 30 16:45:01 2014 -0500
+commit e4c86ac
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Jun 26 20:13:30 2016 +0200
 
-    Eliminate proto_tree_add_text from WiMax plugin.
+    remove Wireshark.pro, modify update-tx accordingly
     
-    Most of this was done with a custom perl script that picked out the field names from the XBIT macro and generated an hf_ and filter (that was humanly tweaked from there).
+    Wireshark.pro is the qt project file used by qmake
+    which in turn was used by nmake
     
-    Change-Id: I563db9f8ea216efe37322b784ab0daf25c038d9e
-    Reviewed-on: https://code.wireshark.org/review/6149
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 114e773
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 31 16:46:50 2014 -0800
-
-    Call setlocale() before getting version information.
+    now that nmake is gone, the only reason to keep Wireshark.pro
+    was the update-tx script that syncs our translation files with Transifex
     
-    That way, the setlocale() call used to get the current locale will get
-    the right answer.
+    update-tx calls lupdate to create a list of texts to translate and
+    lrelease to convert such a list into a binary file
+    lupdate and lrelase can read file names from a project file or
+    get them on the command line
     
-    Change-Id: Ib43e16a9d98d08e5ddaff81fd3235f5b64d7b95b
-    Reviewed-on: https://code.wireshark.org/review/6197
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    modify update-tx to pass the required file names on the command line
+    we can use wildcards so there's no need to change update-tx when a new
+    source file is added
+    
+    remove Wireshark.pro from the release tarball as well
+    
+    Change-Id: I7ff4ebc96f13b4ffc6fb1b2f4e045999fbfbed5e
+    Reviewed-on: https://code.wireshark.org/review/16151
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    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: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit a53b67c
+commit 641904b
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 31 16:10:02 2014 -0800
+Date:   Wed Jun 29 18:45:41 2016 -0700
 
-    Don't include header files that we don't appear to need.
+    Pass the format as an argument to write_specified_fields().
     
-    Some don't appear to be necessary at all, as ui/qt/main.cpp doesn't do
-    very much (most of the work is done in various class implementations,
-    including WiresharkApplication), and a few only appear to be necessary
-    on Windows.
+    That makes failing to specify a format a compile-time error.
     
-    Change-Id: Ic9eae65e77e2425144f7fe4885fc865fcf6ab1ff
-    Reviewed-on: https://code.wireshark.org/review/6196
+    Change-Id: Iff0bda8be35b1e3acc97e4314657ceaff2b3d0be
+    Reviewed-on: https://code.wireshark.org/review/16218
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 9a7d455
+commit b4e8479
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 31 15:32:42 2014 -0800
+Date:   Wed Jun 29 18:39:45 2016 -0700
 
-    Use setlocale() to get the current locale.
+    Mention autotools, give some information for other UN*Xes.
     
-    This:
+    For OS X, mention the use of CMake or autotools for building.
     
-       1) should work on Windows;
+    For Linux, mention autotools as well as CMake, and speak of Debian
+    derivatives other than Ubuntu.
     
-       2) reflects what the C environment is actually set up to use,
-          rather than what the environment variables for locale are
-          set up to use - C programs default to the C locale and only
-          pick up the setting from the environment variables etc. if
-          you explicitly request the system locale with a setlocale()
-          call.
+    Add a section for UN*Xes other than OS X and Linux.
     
-    Change-Id: Iee064237e70501a5450d4daa9ab849391f200efd
-    Reviewed-on: https://code.wireshark.org/review/6195
+    Change-Id: I73bb7afe2d427333b10016aeb497ab32eee16d43
+    Reviewed-on: https://code.wireshark.org/review/16217
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 1bc2565
+commit 73e414d
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 31 14:53:29 2014 -0800
+Date:   Wed Jun 29 17:21:53 2016 -0700
 
-    Don't include signal.h unless we need it.
+    ui/qt/i18n.qrc is a generated file; ignore it.
     
-    Change-Id: I3965e0951eee919720f780b5e52732fd18fd9786
-    Reviewed-on: https://code.wireshark.org/review/6194
+    Change-Id: Ifc8b45d42d9dbf9560ec825e3ce1784534df7b3b
+    Reviewed-on: https://code.wireshark.org/review/16216
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 91e4330
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Dec 31 14:21:50 2014 -0800
-
-    Qt: Convert more dialog titles.
-    
-    Change-Id: I9c3e3471a92b7af9347a541bece3d9405d37dce0
-    Reviewed-on: https://code.wireshark.org/review/6193
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 0e57ff2
+commit bef07e7
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 31 14:47:04 2014 -0800
+Date:   Wed Jun 29 17:07:44 2016 -0700
 
-    We no longer do anything signal-related, so don't include <signal.h>.
+    Remove unused edt field from print_data structure.
     
-    Update a comment pertaining to that, while we're at it.
-    
-    Change-Id: Ic0a3f8575f8e98ca6032ed3e06e3dd76055d65a1
-    Reviewed-on: https://code.wireshark.org/review/6192
+    Change-Id: I5778b08c52119b5be1ec482be9417b3c4ba8ed62
+    Reviewed-on: https://code.wireshark.org/review/16215
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 23b1127
+commit 6190f49
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 31 13:43:01 2014 -0800
+Date:   Wed Jun 29 16:53:06 2016 -0700
 
-    Swallow get_glib_version_info() into get_compiled_version_info().
-    
-    It's not that complicated, so we might as well just do it in line.
+    Get rid of unused edt member in write_pdml_data structure.
     
-    Change-Id: I10809db554e668a853d28e7dca48b2de0ed51ad3
-    Reviewed-on: https://code.wireshark.org/review/6190
+    Change-Id: I2a41d378187c1685afb701372cf3a8ec9c0aeb70
+    Reviewed-on: https://code.wireshark.org/review/16214
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 93efc20
+commit 6d06e69
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 31 13:25:13 2014 -0800
+Date:   Wed Jun 29 16:49:04 2016 -0700
 
-    "#else", not "#elif", for the last part of a chain of conditionals.
+    Remove unused edt member from write_json_data structure.
     
-    Also give more details, for future reference, on how to determine
-    whether the processor supports CPUID.
-    
-    Change-Id: I01e7173e45b0079f02338e51248238c05302dbd2
-    Reviewed-on: https://code.wireshark.org/review/6189
+    Change-Id: Id8b45715c753dc6006f7833e5f49bd8aabc15271
+    Reviewed-on: https://code.wireshark.org/review/16213
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit c15b749
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Dec 31 17:36:13 2014 +0100
-
-    Qt: fix 'Limit to display filter' functionality in Conversations/Endpoints windows
-    
-    Change-Id: Ib57df32fbbe820b1105b11200b112d56a112e2a9
-    Reviewed-on: https://code.wireshark.org/review/6180
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit d5d2c0e
+commit 2257478
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 31 11:51:33 2014 -0800
+Date:   Wed Jun 29 16:13:38 2016 -0700
 
-    ws_cpuid() returns a success/failure indication; make it gboolean.
+    Fix -T fields, broken by ceae9e4d1fff4500b285dba021c3f239ff87779e.
+    
+    Rename write_fields_proto_tree() to write_specified_fields(), and make
+    it static.  Make write_fields_proto_tree() a wrapper around
+    write_specified_fields() that sets the format to FORMAT_CSV.  Have
+    write_specified_fields() fail with an assertion if fields->format isn't
+    one of the known formats, to catch problems such as this in the future.
     
-    Change-Id: I03403ce29c4ac343d56fc2cf33aa8da90a082cbb
-    Reviewed-on: https://code.wireshark.org/review/6185
+    Don't fill in the "data" structure if we're not going to use it.
+    
+    Change-Id: I11dbf448d72ca389f0e5fb8558a41b7eecf7c9a4
+    Reviewed-on: https://code.wireshark.org/review/16210
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 35cf7c6
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 31 11:46:04 2014 -0800
+commit af52c85
+Author: Benjamin Coddington <bcodding@redhat.com>
+Date:   Fri Jun 24 09:24:20 2016 -0400
 
-    Distinguish between IA-32 and non-x86.
+    packet-nfs: fixup whitespace in pNFS SCSI work
     
-    In case we make ws_cpuid() work on IA-32 processors, add a separate
-    "always returns no" version of ws_cpuid() for non-x86 processors.
+    A recent patch introduced whitespace errors.. clean them out.
     
-    Change-Id: Id6fbd3e5c7d4f04063bc9bcd8f1644cd617b297e
-    Reviewed-on: https://code.wireshark.org/review/6184
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Id67bed40646d60dc6775e1e1f958a5a07a5f5f6d
+    Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
+    Reviewed-on: https://code.wireshark.org/review/16205
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit cb7c949
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 31 11:34:08 2014 -0800
+commit bca1f8c
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Jun 29 13:14:23 2016 -0700
 
-    Move some routines into ws_version_info.c.
+    Remove an unused image.
     
-    The routines to get compiler, GLib version, CPU, and memory info are
-    used only in routines in ws_version_info.c; move them into
-    ws_version_info.c and make them static.
+    Remove ui/qt/progress_overlay.png.
     
-    Change-Id: I58edd18da3301095012d2c7a3c5198e5a7073964
-    Reviewed-on: https://code.wireshark.org/review/6183
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I2016c6aa5f77314add9870ba95d1c297d72a05c3
+    Reviewed-on: https://code.wireshark.org/review/16207
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit ce9ca9d
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Dec 31 12:52:52 2014 +0100
+commit e1b1304
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Wed Jun 29 20:05:27 2016 +0100
 
-    rtse.cnf: fix Nesting level does not match indendation (CID 1159214)
+    Update README.qt
     
-    Change-Id: I86e6c9103990bedf93c323e1360394a7c0a39db4
-    Reviewed-on: https://code.wireshark.org/review/6173
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: Icf7774098986da29efdf76af1dcf217bced428e4
+    Reviewed-on: https://code.wireshark.org/review/16206
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit f42fe1a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Dec 31 11:53:00 2014 +0100
+commit 272ec20
+Author: clairvoyant <joserubiovidales@gmail.com>
+Date:   Thu Jun 23 16:33:50 2016 +0200
 
-    Zbee ZDP: fix Copy-paste error (CID 1158598)
+    LAPD. SCTP can carry LAPD information.
     
-    Change-Id: If98d391f51c9d2aa31b1a3a93b774d91d364cccc
-    Reviewed-on: https://code.wireshark.org/review/6163
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+         * LAPD can be configured in "Decode As" using port and protocol identifier.
+         * Add default sctp ppi (the number is not assigned by IANA).
+    
+    Change-Id: Iaa4797e844f6480881605ad4e6b408d7d5f60cad
+    Reviewed-on: https://code.wireshark.org/review/16107
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
 
-commit 02f41b1
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Dec 31 12:42:09 2014 +0100
+commit be12a25
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Thu Jun 23 23:10:08 2016 -0400
 
-    GTPv2: fix Copy-paste error (CID 1158587)
+    Provide new interface for Export PDU.
     
-    Change-Id: I56eaa2071b4b8042c214cf882d35ebec646d2cb5
-    Reviewed-on: https://code.wireshark.org/review/6169
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Rather than have a bitmask for each desired field, have a dissector
+    provide a list of structures that represent data that goes into
+    the PDU.
+    
+    Change-Id: I125190cbaee489ebffb7d9f5d8bc6f3be2d06353
+    Reviewed-on: https://code.wireshark.org/review/16122
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit f485b28
+commit 4656191
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Dec 31 08:53:39 2014 -0800
+Date:   Tue Jun 28 10:35:27 2016 -0700
 
-    Test suite: Make sure we have a usable locale before we run iconv.
+    CMake: Update the macOS wrapper script behavior.
+    
+    CMake on macOS creates a convenience wrapper (run/wireshark) that runs
+    run/Wireshark.app/Contents/MacOS/Wireshark. Have it run the executable
+    using "exec" instead of opening the bundle using "open" so that
+    Wireshark runs in the foreground.
     
-    Change-Id: Ib1f3143dc48af4c556b9bcdfafbb477fd59b6359
-    Reviewed-on: https://code.wireshark.org/review/6181
+    Change-Id: I295ce0681da75678e5e01781e9c8fb58e2236fc9
+    Reviewed-on: https://code.wireshark.org/review/16196
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit fad9b76
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Dec 31 12:39:57 2014 +0100
+commit ceae9e4
+Author: Martin Kacer <kacer.martin@gmail.com>
+Date:   Tue Jun 28 13:01:25 2016 +0200
 
-    wslua field: fix Copy-paste error (CID 1158590 & 1158589)
+    tshark fields filter added for other outputs
     
-    Change-Id: I566ddd2930b5c86bc32ca9ba12cd4be7d994bd22
-    Reviewed-on: https://code.wireshark.org/review/6168
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    -e fields filter addded to ek|json|pdml output.
+    
+    Bug: 12529
+    Change-Id: I1f0f8772eefceb5b71927925ce0c34af483571b9
+    Reviewed-on: https://code.wireshark.org/review/16193
+    Petri-Dish: Guy Harris <guy@alum.mit.edu>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 24c076f
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Dec 31 12:37:22 2014 +0100
+commit 348e364
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Tue Jun 28 19:31:32 2016 -0700
 
-    pcapng (wiretap): fix Copy-paste error (CID 1158591 & 1158592)
+    Distribute i18n.qrc.in in the release tarball.
     
-    Change-Id: I117c007c0a8be573bb3069fc44a490e6e5d2fef8
-    Reviewed-on: https://code.wireshark.org/review/6167
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I4f974351ab1f4781e140873f460d028f49640ca1
+    Reviewed-on: https://code.wireshark.org/review/16200
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit b0e6fbf
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Dec 31 11:08:07 2014 -0500
+commit 07570b5
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Tue Jun 28 17:24:19 2016 -0700
 
-    umts_fp: Replace se_new0(...) by wmem_new0(wmem_file_scope(), ...)
+    Don't assume GNU sed.
+    
+    Not all versions of sed support "\n" as meaning "newline" in the
+    replacement string of an s command.  POSIX requires tr to support "\n"
+    in the replacement string, however, so use % as meaning "newline" in the
+    sed script, and translate it to a newline using tr.
     
-    Change-Id: I9d40ffd199147fb8b975c493253d5cf796be5983
-    Reviewed-on: https://code.wireshark.org/review/6179
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: Icdbc0b55787340953dfc90ea82e0421b4e77a896
+    Reviewed-on: https://code.wireshark.org/review/16199
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit f7b6dcc
-Author: Hadriel Kaplan <hadriel@128technology.com>
-Date:   Mon Dec 29 20:49:05 2014 -0500
+commit 5c03bda
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Tue Mar 15 03:06:21 2016 +0000
 
-    Lua: allow a Dissector object to be passed in for register_heuristic
+    Qt: Generate .qm files during build
     
-    Bug: 10695
-    Change-Id: I81181b2d00fcb5f0c25ab89bbe4968897f47a3a6
-    Reviewed-on: https://code.wireshark.org/review/6131
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    Change-Id: Ia2ee723227e1b331eeec0f0463654f35a4c9f37b
+    Reviewed-on: https://code.wireshark.org/review/14508
+    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit 1121288
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Dec 31 12:33:15 2014 +0100
+commit fff248b
+Author: Bruno Verstuyft <bruno.verstuyft@excentis.com>
+Date:   Mon Jun 20 14:29:10 2016 +0200
 
-    GTP: fix Copy-paste error (CID 1158594 & 1158595)
+    DOCSIS: Added dissector for OFDM Channel Descriptor
     
-    Change-Id: I501c0d666c7b280656e2d7cf7a196d489d452eff
-    Reviewed-on: https://code.wireshark.org/review/6166
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: Idbbc1ad126e0b01952957a914bd9c16a990a9b9e
+    Reviewed-on: https://code.wireshark.org/review/16036
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit a1732dc
+commit 42b8c95
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Dec 31 16:47:28 2014 +0100
+Date:   Tue Jun 28 21:47:46 2016 +0200
 
-    GTK: fix 'Limit to display filter' functionality in Conversations/Endpoints windows
+    3GPP NAS: add a missing separator for optional string
     
-    Change-Id: I1efb7717c9eb4638fbff292e2953accc3e945ee6
-    Reviewed-on: https://code.wireshark.org/review/6178
+    Change-Id: Idddbae0e969b525ddbe31f3b1ddbccaed232891a
+    Reviewed-on: https://code.wireshark.org/review/16197
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 9e7d69f
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Dec 31 10:30:33 2014 -0500
-
-    checkAPIs.pl: Error/warnings output goes to STDERR
-    
-    Change-Id: Ib6f460147c26c4fbfb9bd0fd8dd0dd12561be9ea
-    Reviewed-on: https://code.wireshark.org/review/6177
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit 493e413
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Dec 31 12:50:46 2014 +0100
+commit 422c0f4
+Author: Gerald Combs <gerald@zing.org>
+Date:   Mon Jun 27 20:13:35 2016 -0700
 
-    SCTP: fix Nesting level does not match indendation (CID 1159213 & 1159215 )
+    Qt: Make the packet map work with Qt 5.7.
     
-    Change-Id: Icd04c5f1f09b9cf704828e4b6a598cd2c1f6dd15
-    Reviewed-on: https://code.wireshark.org/review/6172
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit beb50e6
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Dec 31 12:49:27 2014 +0100
-
-    DHCPv6: fix Nesting level does not match indendation (CID 1159219)
+    It's not safe to assume that the overlay scroll bar range is equal(ish)
+    to the number of packets. Adjust our arithmetic accordingly.
     
-    Change-Id: Id57a9f2df6a4011078b0bef359b2cd5503f6f7ce
-    Reviewed-on: https://code.wireshark.org/review/6171
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: Ic8cc8a746bdd2bdc6771794303e95a810bc3d1d2
+    Reviewed-on: https://code.wireshark.org/review/16186
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 784b39c
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Dec 31 12:48:09 2014 +0100
+commit 000ac66
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Jun 28 08:54:53 2016 -0700
 
-    GTPv2: fix typo in Anders e-mail Address
+    Qt: Make recent preferences changes work with Qt4.
     
-    Change-Id: I2410aa7bce574c9153b971b2d8b0cbfbe24e54dc
-    Reviewed-on: https://code.wireshark.org/review/6170
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0f6f2bd
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Dec 31 12:26:14 2014 +0100
-
-    jxta: fix Copy-paste error (CID 1158599 & 1158600)
+    Cast a pointer to a QWidget * so that compilation and pref selection
+    works for Qt4. Add an assert and some comments.
     
-    Change-Id: Ica4ade2e7de70cefc4e77d421e35ddd72e688c16
-    Reviewed-on: https://code.wireshark.org/review/6165
+    Change-Id: Ide89b698220a9af7b7252488f0770ff35081432e
+    Reviewed-on: https://code.wireshark.org/review/16195
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit aeb10b9
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Dec 31 12:20:55 2014 +0100
+commit ff8c6d9
+Author: Jens Kilian <jens.kilian@advantest.com>
+Date:   Tue Jun 28 10:32:26 2016 +0200
 
-    mount: fix Copy-paste error (CID 1224605)
-    
-    Don't longer need to check if(tree)
+    Qt: Add a missing Q_DECLARE_METATYPE to fix a compile error on RHEL 7.
     
-    Change-Id: I4ec572df28bad3c487c3c744840d97b79781feb3
-    Reviewed-on: https://code.wireshark.org/review/6164
+    Change-Id: I6cf0a95525334d5a7561a477093b892a3f821b98
+    Reviewed-on: https://code.wireshark.org/review/16189
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 7c93e81
+commit 980d3b4
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Dec 29 18:05:09 2014 +0100
+Date:   Mon Jun 27 08:08:28 2016 +0200
 
-    Column utils: Missing varargs init or cleanup (CID 1212122)
+    DTN: fix indent
     
-    Change-Id: I013c737c2cd62e3f1f49b113a7ce0c0616e1ecc4
-    Reviewed-on: https://code.wireshark.org/review/6119
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    * Replace tab by 4-spaces
+    * Add modelines (for packet-dtn.c)
+    
+    Change-Id: I668f20b4a021ef94a1bb0b26ac815495eb9920d9
+    Reviewed-on: https://code.wireshark.org/review/16165
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 60d7413
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Dec 31 12:29:12 2014 +0100
+commit 0321d06
+Author: David Zoller <zollerd@gmail.com>
+Date:   Sat Jun 25 09:13:00 2016 -0500
 
-    prefs: fix typo
+    DTN follow up to Change ID: I49769271a41b6a7b23c6bc1d4beaadbe8819198d
     
-    Change-Id: Ic4dbbab5e53b5745cb703e6e30b2dc6251c3918e
-    Reviewed-on: https://code.wireshark.org/review/6161
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: Ia90644c22896586e4a260a3bf11d1f3e50bd4c4b
+    Reviewed-on: https://code.wireshark.org/review/16134
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit c34c2a6
+commit ca369ac
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Dec 31 12:36:58 2014 +0100
+Date:   Tue Jun 28 16:47:20 2016 +0200
 
-    Fix conversations filtering
+    3GPP NAS: upgrade dissector to v13.6.0
     
-    Change-Id: Ic615830a373deab349a0a5a62f25b131e0bcbf18
-    Reviewed-on: https://code.wireshark.org/review/6162
+    Change-Id: Ieffc5d6544f3bd121ff317ff598faaadb5f117ab
+    Reviewed-on: https://code.wireshark.org/review/16194
     Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 3865bca
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Dec 31 15:17:19 2014 +0100
+commit 670b119
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Jun 28 10:43:12 2016 +0200
 
-    Update libwsutil symbols
+    print.c NULL pointer check in print_escaped
     
-    Change-Id: Icddb71202fb44ab3cf2ee5923b5a10f71f078ce5
-    Reviewed-on: https://code.wireshark.org/review/6176
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Added NULL pointer check in print_escaped functions.
+    Requested by comment in change 16034.
+    
+    Change-Id: Id172d772d9b5cb4bcd31fe8b42286f885ec5b968
+    Reviewed-on: https://code.wireshark.org/review/16188
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Dario Lombardo <lomato@gmail.com>
 
-commit 22701ad
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Dec 31 13:48:51 2014 +0100
+commit 8c006fe
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Jun 28 10:43:12 2016 +0200
 
-    DNS: ensure that suffix_addr structure is always initialized
+    print: change function call.
     
-    Bug: 10816
-    Change-Id: Ifd036148f9f2e76516913bda11cf07fdb63def94
-    Reviewed-on: https://code.wireshark.org/review/6174
+    Change-Id: I8cae4a8d2b57f961d16cb388befed2348a88badc
+    Reviewed-on: https://code.wireshark.org/review/16191
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Martin Kacer <kacer.martin@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Dario Lombardo <lomato@gmail.com>
 
-commit 37efc4a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 31 02:23:14 2014 -0800
+commit 94830dc
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Jun 28 10:42:55 2016 +0200
 
-    We do stuff with signals only on UN*Xes.
+    print: merge json and ek functions.
     
-    Change-Id: I1b1a304143cf4e4a14107d1d55057cef24552a70
-    Reviewed-on: https://code.wireshark.org/review/6160
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ia5d75bab03bfc065651ea83c936aedffb1f69e9f
+    Reviewed-on: https://code.wireshark.org/review/16190
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Martin Kacer <kacer.martin@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Dario Lombardo <lomato@gmail.com>
 
-commit 914dc6c
-Author: Luke Mewburn <luke@mewburn.net>
-Date:   Wed Dec 24 13:19:57 2014 +1100
+commit 7fcdc75
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Tue Jun 28 07:29:50 2016 +0200
 
-    E.164: display country_code as decimal not hex
+    print(.c): fix no previous prototype for 'check_protocolfilter' [-Wmissing-prototypes]
     
-    Display and filter e164.country_code and e164.identification_code
-    as decimal instead of hexadecimal, as that is more natural.
-    E.g. Use 'e164.country_code == 61' instead of 'e164.country_code == 0x61'
-    to match Australia (+61...)
+    Change-Id: Ib10e919dd3f0bec92004c68bf73a3c7d37961f03
+    Reviewed-on: https://code.wireshark.org/review/16187
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit e5a1afc
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Jun 27 14:34:29 2016 -0700
+
+    Qt: Preferences dialog performance improvements.
     
-    If the country_code or identification_code contain BCD digits > 9
-    add an expert info warning.
+    Fill in advanced and module tree item text when requested.
     
-    Required modifying the various prefix to description value_string
-    arrays from hex to decimal constants, and converting the decoded BCD
-    from hex to decimal before adding to the proto tree.
+    Create ModulePreferencesScrollAreas only when we need to show them.
     
-    Change-Id: Ibedfc75246fe409b7d63776083379bb028fb784b
-    Reviewed-on: https://code.wireshark.org/review/6054
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I5aa7d5dba8f5d20de088de3a9d1ee9d58e779269
+    Reviewed-on: https://code.wireshark.org/review/16181
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 8f75a2e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 31 00:50:01 2014 -0800
+commit ee6c1f5
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Mon Jun 27 23:17:27 2016 +0200
 
-    And, again, no more version_info.c.
+    OSPF: Differentiate meaning of N/P bit in NSSA LSA type 7
     
-    Change-Id: I0500383aa6c553e995c60fad850553c0ce5a66d9
-    Reviewed-on: https://code.wireshark.org/review/6159
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit a3d946c
-Author: Ebben Aries <exa@fb.com>
-Date:   Wed Dec 31 00:54:40 2014 -0700
-
-    BGP : Simple typo fix for BGP Attribute
+    In OSPF v2 the N/P bit in NSSA LSA type 7 messages has to be
+    interpreted as P-bit (RFC 3101) instead of N-bit. This change
+    makes it so.
     
-    Change-Id: I793eed5c7d63c82e13847c8a6c8fd6def3025b8c
-    Reviewed-on: https://code.wireshark.org/review/6158
-    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
-    Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
+    Bug: 12555
+    Change-Id: I1d4a8978ca42d0472d5967528e72cbfada87b799
+    Reviewed-on: https://code.wireshark.org/review/16174
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 64dd98e
+commit f0e6764
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Dec 30 23:09:41 2014 -0800
+Date:   Mon Jun 27 19:58:21 2016 -0700
 
-    No version_info.c any more.
+    Global, not static.
     
-    Change-Id: I96f4d07ac08d80811bb4ba9469cba8265d288945
-    Reviewed-on: https://code.wireshark.org/review/6157
+    Change-Id: I185a1786365f185f18f3ec492a8ef165d61595ed
+    Reviewed-on: https://code.wireshark.org/review/16185
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 938b6a7
+commit 3ebac2b
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Dec 30 23:07:24 2014 -0800
+Date:   Mon Jun 27 19:54:42 2016 -0700
 
-    Wrong function name.
+    Have commandline_other_options() directly fill in the global structure.
     
-    Change-Id: I56e6a7dbb7290963548fdd61784554d67fc70bfe
-    Reviewed-on: https://code.wireshark.org/review/6156
+    Other code looks at the global structure, so there won't be other
+    structures; just fill in the global structure directly.
+    
+    Change-Id: I4dc87b79168c5a7c9ab1f085aa2d78cc6d2c9019
+    Reviewed-on: https://code.wireshark.org/review/16184
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 0bf38f7
-Author: Hadriel Kaplan <hadrielk@yahoo.com>
-Date:   Tue Dec 30 17:39:56 2014 -0500
+commit ac4ad2b
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Mon Jun 27 18:56:29 2016 -0700
 
-    Lua: getting fieldinfo.value for FT_NONE causes assert
+    Don't set quit_after_cap if no pcap, as it's not present.
     
-    Retrieving an FT_NONE field's value through `fieldinfo.value` or
-    `fieldinfo()` causes an assert.  It should retrieve the label instead.
-    
-    Bug: 10815
-    Change-Id: Ia80443f3dd046b2cc31d1dff70d599e96d6f6fe3
-    Reviewed-on: https://code.wireshark.org/review/6150
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
-    Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
+    Change-Id: I871f75394ba66967d7d7be203bd9e235575458e1
+    Reviewed-on: https://code.wireshark.org/review/16183
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 27be466
+commit 5d019cf
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Dec 30 22:28:25 2014 -0800
+Date:   Mon Jun 27 18:40:09 2016 -0700
 
-    Do the full string in get_{compiled,runtime}_version_info().
+    Make quit_after_cap an item in commandline_param_info_t.
     
-    Have them start the string with "Compiled" or "Running on", and return
-    the string when done.
+    And make the commandline_info structure global, so all the places that
+    look at quit_after_cap can get at it.
     
-    Change-Id: Ic4d290c963621fa0385dc5aab766fd4ad31d3810
-    Reviewed-on: https://code.wireshark.org/review/6155
+    Change-Id: I006329cf8842c655cca36f024570855d1b16e107
+    Reviewed-on: https://code.wireshark.org/review/16182
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 84110d2
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Dec 30 23:46:24 2014 +0100
+commit 3f49e89
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Mon Jun 27 17:21:24 2016 -0700
 
-    tshark: endpoints statistics are not supported for now, do not list them in -z
+    Pull quit_after_cap out of the global capture options.
     
-    Move statistics registration to "GUI" callback registration
+    Really, all the GUI-related options should be pulled out, so they're not
+    cluttering up dumpcap and tshark.
     
-    Change-Id: Id27c049dc8f91d311e9231342ae40749ca0ff5fc
-    Reviewed-on: https://code.wireshark.org/review/6151
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I0276dee2be48bae3498a819d8c0c2747fe1352e7
+    Reviewed-on: https://code.wireshark.org/review/16180
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit c1f3047
+commit 72d9785
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Dec 30 19:36:26 2014 -0800
+Date:   Mon Jun 27 16:49:08 2016 -0700
 
-    Move the version_info.c stuff to wsutil/ws_version_info.c.
+    We need global_capture_opts if we have extcap, even without pcap.
     
-    Change-Id: I3a5c7e219974bfb924819b43b4d445eaf00e5bde
-    Reviewed-on: https://code.wireshark.org/review/6153
+    Change-Id: I16b778064c1cd2bbf281fb5192bf35da252e99dd
+    Reviewed-on: https://code.wireshark.org/review/16179
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 4eeb440
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Dec 30 19:25:35 2014 -0500
-
-    Remove proto_tree_add_text from packet-dcerpc-pn-io.c
-    
-    Change-Id: Ia144061dc8c394d9ae89135009d06457e2aabb7d
-    Reviewed-on: https://code.wireshark.org/review/6152
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit dcbebe0
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Dec 30 12:38:52 2014 -0800
-
-    Test suite: Start testing our output for valid UTF-8.
-    
-    Feed the output of `tshark -G <glossary>` to `iconv -f UTF-8`. Adjust a
-    couple of the Bluetooth dissectors and X11 keysyms accordingly.
-    
-    Change-Id: I5b04dc3fa4734c8f0a795daf44bd398fe5ebc1bd
-    Reviewed-on: https://code.wireshark.org/review/6146
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 3b57861
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Dec 29 14:12:43 2014 -0800
-
-    Qt: More WiresharkDialog conversions.
-    
-    Convert the Follow Stream and Export Objects dialogs.
-    
-    Change-Id: I8a4dda634f2f0475a24cf09601f76fb52069fe50
-    Reviewed-on: https://code.wireshark.org/review/6126
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 97f5f39
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Tue Dec 30 19:33:16 2014 +0100
-
-    free the temporary buffers allocated by gnutls_x509_privkey_export_rsa_raw()
-    
-    Bug: 10740
-    Change-Id: Idd4afab1bca6204d17c4bd4345661ec821f209e0
-    Reviewed-on: https://code.wireshark.org/review/6145
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit bc7a9e5
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Dec 30 16:23:07 2014 +0100
-
-    Fix IPv6/IPX statistics generation
-    
-    Use a doubly-linked list and iterate on the reversed statistics list to always test the bigger strings first
-    
-    Bug: 10813
-    Change-Id: Ibfedac9648db58e6dadc2334eec678e26daca906
-    Reviewed-on: https://code.wireshark.org/review/6140
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 935c8bf
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Dec 30 18:07:32 2014 +0100
+commit 9b91e64
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Tue Jun 28 00:34:07 2016 +0200
 
-    Websocket: use pinfo pool and not packet one for the unmasked data tvb
+    test: ensure temporary directory outside source tree
     
-    As indicated in README.wmem, pinfo pool must be used for anything that might
-    end up being passed to add_new_data_source
+    The whole point of using mktemp is to get a temporary directory outside
+    the source tree. Commit v2.1.0rc0-1027-ge01f8fb tried to fix the
+    invocation for *BSD (including OS X), but by adding a template it
+    dropped the implicit --tmpdir option for GNU mktemp on Linux..
     
-    Change-Id: I4a6396fc52e6c70c771390f502d58199c38c172a
-    Reviewed-on: https://code.wireshark.org/review/6144
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit f3f736c
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Tue Dec 30 17:57:44 2014 +0100
-
-    clean up the part where dissect_websocket() is called recursively
+    Use the GNU mktemp invocation and if it fails (for example, because a
+    template is expected for BSD/OS X), provide a template.
     
-    Change-Id: Ia94ddb2c4cb03fe5d1af9f8d316e1cdb18fe8283
-    Reviewed-on: https://code.wireshark.org/review/6143
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    Change-Id: I77bbc7dc2045e4fa756e102afa080860b0857713
+    Reviewed-on: https://code.wireshark.org/review/16178
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
 
-commit 246f727
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Tue Dec 30 17:50:30 2014 +0100
+commit e69194a
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Mon Jun 27 23:23:31 2016 +0200
 
-    use packet-scoped memory for the unmasked data tvb
+    qt: fix linking error with global_capture_opts
     
-    Change-Id: I5f9b769e26c16072a1656dfe9094487d6dfe76f4
-    Reviewed-on: https://code.wireshark.org/review/6142
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    global_capture_opts is already defined by ui/commandline.c which is also
+    linked with wireshark-qt.cpp. Remove the duplicate definition to avoid a
+    build failure with the gold linker.
+    
+    Fixes regression from v2.1.1rc0-192-g9b5b444.
+    
+    Change-Id: I4484e2769bf270dee1ec0378fd9c925e01eaf390
+    Reviewed-on: https://code.wireshark.org/review/16175
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
 
-commit e05e8f8
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Tue Dec 30 17:44:45 2014 +0100
+commit 4add8b6
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Thu Jun 16 15:27:25 2016 -0700
 
-    skip the payload if it's empty
+    cmake: add idl2wrs-dissectors target for DCERPC
     
-    Change-Id: Ib38e747bc762422c690abc1cb127bb0944c80ce2
-    Reviewed-on: https://code.wireshark.org/review/6141
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    Add a callable target such that dissectors can be generated without the
+    AUTOGEN_dcerpc option.
+    
+    Modelled after the pidl CMakeLists.txt file and target. This approach
+    has the advantage over the previous implementation such that the clean
+    target does not remove the packet-dcerpc-X.c files.
+    
+    Change-Id: I3226937eaa76dffa253df9d4f989421d5faa3f3f
+    Reviewed-on: https://code.wireshark.org/review/15989
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
 
-commit 8629aa2
+commit b0b2540
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Dec 29 15:15:59 2014 -0800
+Date:   Mon Jun 27 09:02:51 2016 -0700
 
-    Qt: Continue using the new window title format.
+    Qt: Clean up capture file callbacks.
     
-    Update several dialog titles to "Wireshark · <subtile...>".
+    Mark some callbacks GTK+ only as appropriate. Change a debug message to
+    an assert since we handle all callbacks.
     
-    Change-Id: I64645e913500ecd55a008e1609b46385dafe7de9
-    Reviewed-on: https://code.wireshark.org/review/6127
+    Change-Id: I4266f0d7134d19a9c0432354ea36de67501275b4
+    Reviewed-on: https://code.wireshark.org/review/16171
     Petri-Dish: Gerald Combs <gerald@wireshark.org>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 1ee4369
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Tue Dec 30 16:47:30 2014 +0100
+commit d8ddf84
+Author: Martin Kacer <kacer.martin@gmail.com>
+Date:   Mon Jun 27 06:41:56 2016 +0200
 
-    no need for if(tree)
+    Fixed tshark pdml output.
     
-    Change-Id: I0b20b66e1b44da0362c13009946a69738a2aa267
-    Reviewed-on: https://code.wireshark.org/review/6138
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    Corrected if no protocol filter (-j) specified.
+    
+    Change-Id: Id20dd255642951633efa935dbb1363e7b9aa9be0
+    Reviewed-on: https://code.wireshark.org/review/16164
+    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
 
-commit d45fe5c
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Dec 30 10:48:44 2014 +0100
+commit d90e6e7
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Mon Jun 27 09:48:35 2016 -0400
 
-    .mailmap: Add Hadriel Kaplan
+    There's no need to check the return from g_array_index().
     
-    Change-Id: Iddab5a98e47d90fe4a7e6fbf6b55bbb16e528415
-    Reviewed-on: https://code.wireshark.org/review/6136
-    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
-    Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
+    g_array_index() returns an index into an array: we're sure to find
+    something at that index (whether that something is in bounds is
+    a-whole-nother question).
+    
+    This fixes CIDs 1362829 and 1362890/1362830.  There were other CIDs like
+    this but they've already been fixed.
+    
+    Change-Id: I94af0931b9adf3abd3bedc969e399cda98bbdd07
+    Reviewed-on: https://code.wireshark.org/review/16168
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
 
-commit e0d268b
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Dec 29 17:24:44 2014 -0800
+commit 2ab4155
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sun Jun 26 10:52:37 2016 -0400
 
-    stats_tree: Make sure some structs are fully initialized.
+    tvb_get_string_enc + proto_tree_add_item = proto_tree_add_item_ret_string
     
-    Get rid of a strcpy.
+    Also some other tricks to remove unnecessary tvb_get_string_enc calls.
     
-    Change-Id: I49460969fdf627fdb89030115ad5a658e300a5d4
-    Reviewed-on: https://code.wireshark.org/review/6130
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I2f40d9175b6c0bb0b1364b4089bfaa287edf0914
+    Reviewed-on: https://code.wireshark.org/review/16158
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 4556498
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Dec 29 11:42:01 2014 -0800
+commit 8c37621
+Author: D. Ulis <daulis0@gmail.com>
+Date:   Sun Jun 26 22:34:03 2016 -0400
 
-    Qt: Convert more dialogs to WiresharkDialog.
+    CIP: Cleanup info column for MSP packets
     
-    Make the Sequence, IO Graph, Statistics Tree, and VoIP Calls dialogs
-    subclasses of WiresharkDialog.
+    1. Skip printing class name in info column when it was an MSP, since it's implied.
+    2. Don't print response status for embedded messages in info column for MSP. It makes the line too long.
+    3. Print the response status for embedded messages in the Service Packet tree. This makes it easier to find the packet that may have failed.
     
-    Remove "Stats Tree" from Statistics Tree dialog titles. Don't complain
-    if the user opens more than one instance of the dialog.
-    
-    Use the applicationName property in WiresharkApplication instead of a
-    separate variable.
+    Change-Id: I2c60fb9baf113a215ada7301f493cbd51e340dcd
+    Reviewed-on: https://code.wireshark.org/review/16162
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
+
+commit 58ccf8e
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Sun Jun 26 21:38:19 2016 -0400
+
+    endpoint dialog: fix compilation when we don't HAVE_GEOIP.
     
-    Add a preexisting item to the IO Graph bug list (hovering when the file
-    is closed clears the graph).
+    Also fix some indentation and white space.
+    Remove a break-after-return.
     
-    Change-Id: I8411a25305d00b16e0d4a82fa50a9bad5c85b239
-    Reviewed-on: https://code.wireshark.org/review/6125
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Bug: 12562
+    Change-Id: I912ccdac62aceaabcffec8f7739da56cc6036abf
+    Reviewed-on: https://code.wireshark.org/review/16159
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit b6ff338
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Dec 29 18:57:31 2014 -0800
+commit 010f5bb
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Jun 27 08:10:33 2016 +0200
 
-    Tabs are not necessarily set every 4 spaces.
+    LTP: fix indent
     
-    Use spaces, not tabs, for indentation; that makes the code's layout
-    indepencent of tab settings, which might be every *8* spaces.
+    replace space by tab
     
-    Change-Id: I69891b6424a668f1ee0ca80cc622b8cb0ed8967e
-    Reviewed-on: https://code.wireshark.org/review/6132
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I52d5fefbf795fe6ee2dbdeda087c49280ba47503
+    Reviewed-on: https://code.wireshark.org/review/16166
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit ed58d88
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Dec 28 21:43:51 2014 -0500
+commit af26f31
+Author: Bruno Verstuyft <bruno.verstuyft@excentis.com>
+Date:   Thu Jun 16 10:24:21 2016 +0200
 
-    Remove some proto_tree_add_text outside the dissector directory.
+    DOCSIS: Fix unknown TLVs in UCD type29 caused parsing errors + bugfixes
     
-    Change-Id: I890846a0cede755a603243b4048fb5c917b2826b
-    Reviewed-on: https://code.wireshark.org/review/6112
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I9ab56ded7ebf9f087afceed979e451e369eaf1d6
+    Reviewed-on: https://code.wireshark.org/review/15967
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 0d414e5
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Dec 27 23:15:41 2014 +0100
+commit 03adf58
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Sun Jun 26 23:42:20 2016 +0200
 
-    Add ability to follow UDP stream by index
+    Remove author comments and some accompanying useless code comments
     
-    -z "follow,udp" tshark cli command now supports a stream index
-    It is now possible to select the UDP stream displayed in Qt GUI (like for TCP)
+    This only removes author's names that appear in the AUTHORS* files.
+    In those cases where a group of people get mentioned, this patch does
+    not remove any in case at least one name is not found in AUTHORS*
     
-    Change-Id: Ia367f36ea4f60db0fddb997a7e0903c09e172f2d
-    Reviewed-on: https://code.wireshark.org/review/6083
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I2259dbda3d4a1250bdc103f3fc5be93df5482489
+    Reviewed-on: https://code.wireshark.org/review/16154
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 0905202
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Dec 29 18:03:59 2014 +0100
+commit ff9e62a
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sat Jun 25 19:23:58 2016 +0100
 
-    TN5250: Missing break in switch (CID 280477)
+    autotools: Qt 5.7 requires C++11
     
-    fix also indent typo
+    Change-Id: Icad622a052a84862ace98a7000f10ccf677f54a5
+    Reviewed-on: https://code.wireshark.org/review/16138
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit fbb23e2
+Author: Thomas Wiens <th.wiens@gmx.de>
+Date:   Fri Jun 24 23:53:36 2016 +0200
+
+    s7comm: Sinumerik NC file transfer
+    
+    Added decoding of up-/downloading files from/to a Sinumerik NC CNC control
+    machine.
     
-    Change-Id: I47ff84a6062a203e14b9dde420a1a2efd5b05fab
-    Reviewed-on: https://code.wireshark.org/review/6118
+    Change-Id: If7939e56e972fc2b8feb12150c4184a880b0cdae
+    Reviewed-on: https://code.wireshark.org/review/16129
     Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 0fb4cdb
+commit 76ae2d9
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Dec 29 18:12:43 2014 +0100
+Date:   Sun Jun 26 18:54:54 2016 +0200
 
-    Wimaxasncp: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    AUTHORS: fix duplicate / wrong name entry
     
-    Change-Id: Ie2808d20a7f8e28bfe9b929b1b222a901a29f510
-    Reviewed-on: https://code.wireshark.org/review/6120
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 621dbdd
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Sat Sep 27 09:37:11 2014 +0100
-
-    Windows build improvements:
-    
-      Added /Zo flag for VS2013 builds to add more debugging info
-      Removed obsolete comment on unused /GS flag and obsolete
-       /FR flag.
-      Removed '#ifdef WIRESHARK_GENERATE_BSC_FILE' and related
-       (which specified the obsolete /FR flag).
-      Added /RELEASE flag to linker to set checksum in PE header
-      Fixed an old typo.
-      CMake added /INCREMENTAL:NO flag to linker to overide default
-      and prevent warning messages.
-    
-    Change-Id: I039b884657d2886acc273dc6dd099d07a7b8ec7d
-    Reviewed-on: https://code.wireshark.org/review/6110
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I1e2bb98d1e78af193f449c75109eabc92f934c11
+    Reviewed-on: https://code.wireshark.org/review/16149
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: David Zoller <zollerd@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 71fe134
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Mon Dec 29 14:20:44 2014 -0500
+commit 148d586
+Author: Martin Kacer <kacer.martin@gmail.com>
+Date:   Sun Jun 26 21:13:06 2016 +0200
 
-    rtsp: Fix (what I think may be) a minor bug.
+    json: corrected json output format.
     
-          (Also fixes a compiler 'Shadow' warning in a different way
-           than the now reverted previous fix).
+    Some pcaps caused invalid json and ek files.
     
-    Change-Id: Iedcac3d402b89d1b0261a49647bf39cc854d1a0c
-    Reviewed-on: https://code.wireshark.org/review/6123
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Bug: 11754
+    Change-Id: Id4c4d744b4d07fe4e8b6423688be1bb10a803844
+    Reviewed-on: https://code.wireshark.org/review/16152
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 7ca5ad9
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Mon Dec 29 13:52:09 2014 -0500
+commit 6196595
+Author: Gerald Combs <gerald@zing.org>
+Date:   Sat Jun 25 09:44:28 2016 -0700
 
-    rtsp: Fix  compiler 'Shadow' warning ...
+    CMake: Qt 5.7 requires C++ 11.
     
-    Change-Id: I404546fc5eab82d7cb12971723040b4aa77f6a90
-    Reviewed-on: https://code.wireshark.org/review/6122
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Add -std=c++11 to CMAKE_CXX_FLAGS if we have Qt >= 5.7.0 and we're
+    compiling with g++ or clang++.
+    
+    Change-Id: Id4ce5921ce5c475e9eb9cc67f94c3b3a895924a1
+    Reviewed-on: https://code.wireshark.org/review/16135
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: João Valverde <j@v6e.pt>
 
-commit 72dedab
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Mon Dec 29 13:05:26 2014 -0500
+commit a4711f8
+Author: Ashish Shukla <shukla.a@gmail.com>
+Date:   Fri Jun 24 15:59:39 2016 -0700
 
-    rtsp: Replace g_warning() by expert...() (dissectors shouldn't do termio).
+    radiotap: Fix for the VHT 20MHz MCS 9 data rate not displayed
     
-    Also: Add an expert...() in rtsp_create_conversation() for
-          "Unknown transport type".
+    MCS 9 at 20 MHz is valid for 3 and 6 spatial streams.
+    Changed the rate table to include rate (mbps) for VHT 20MHz MCS 9.
     
-    Change-Id: I1d8ca20b9c0bc1e3d11b947b6653a2e2669a0f96
-    Reviewed-on: https://code.wireshark.org/review/6121
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    
+    Bug: 12558
+    Change-Id: Ia16ae545a5ac1779131e24e1f54a5659390cd321
+    Reviewed-on: https://code.wireshark.org/review/16146
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit ea08072
+commit 28048a9
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Dec 29 17:11:01 2014 +0100
+Date:   Sun Jun 26 17:19:56 2016 +0200
 
-    Wireshark Dialog (Qt): Add Modelines info
+    circuit(.h): fix indent (and add modelines)
     
-    Change-Id: I6689f5a95c6dc051d660198fd58ae96967f3468f
-    Reviewed-on: https://code.wireshark.org/review/6116
+    Change-Id: I71bb0a8eaf9f5bd34395a4182e4158abaca4ace2
+    Reviewed-on: https://code.wireshark.org/review/16144
+    Reviewed-by: Dario Lombardo <lomato@gmail.com>
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 90ba166
+commit 4f2c3ad
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Dec 29 16:33:21 2014 +0100
+Date:   Sun Jun 26 18:48:30 2016 +0200
 
-    capture_file.h (Qt): missing ]
+    Fix typo on AUTHORS.src (about @)
     
-    Change-Id: Ibc512f03913d77a6c4f0cdbcf5141efbd94b22f0
-    Reviewed-on: https://code.wireshark.org/review/6115
+    Change-Id: Ie4ba5b6ca9cdcf0a90c4b7604b0b4ff89690f3d9
+    Reviewed-on: https://code.wireshark.org/review/16148
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit fce9da3
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Dec 29 10:18:21 2014 +0100
+commit ea4d01d
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jun 26 17:37:49 2016 -0700
 
-    Zebra: Fix some indent typo
+    The "coding" subfield of the VHT field is a bitmask.
     
-    Change-Id: I41869fe46e6867333d14f6f86953ff01e2d112a8
-    Reviewed-on: https://code.wireshark.org/review/6114
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Treat it as such.  Fetch it once, regardless of whether we have any
+    non-zero NSS values or not, and use the per-user NSS value to decide
+    whether a particular bit in the bitmask is valid and worth displaying.
+    
+    Make the four coding fields bitfields, with the appropriate bit.
+    
+    Change-Id: I506b35afa9d07da8d800da5c304d5d0aadd87c54
+    Reviewed-on: https://code.wireshark.org/review/16155
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 211789c
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Dec 29 10:17:04 2014 +0100
+commit 497159f
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jun 26 13:44:17 2016 -0700
 
-    OpenFlow: Capatilize O and F of OpenFlow (when use Decode as)
+    Check for an invalid 11ac MCS/bandwidth/NSS combination.
     
-    Remove also a trailing whitespace in OpenFlow TCP port preference
+    A few of the combinations are marked as "Not valid" in 802.11ac-2013.
     
-    Change-Id: I5c3f42e634e0fee4fecf1a7f2dd1c75a68165b45
-    Reviewed-on: https://code.wireshark.org/review/6113
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Ping-Bug: 12558
+    Change-Id: I18b78ebb84ab32a6fc53c6d634ef07ae87fb4866
+    Reviewed-on: https://code.wireshark.org/review/16153
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 10bfe2c
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Mon Dec 29 11:07:54 2014 -0500
+commit b84637b
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Sun Jun 26 19:07:57 2016 +0200
 
-    dcerpc: Replace g_warning() by expert...() (dissectors shouldn't do termio).
+    Decode partial virtual bitmap in TIM IE
+    
+    - Add yet another filter name for an association id element
+    - Minor (consistency) cleanups in the vicinity of the new hf element.
     
-    Change-Id: If51a9acbb3b5a5b1623c72651c8a3ef2dd8ad068
-    Also: Replace (one of many) proto_tree_add_text() instances.
-    Reviewed-on: https://code.wireshark.org/review/6117
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Bug: 12545
+    Change-Id: Ic8e7580e7de7572e1b449ae03494b25567d86ea3
+    Reviewed-on: https://code.wireshark.org/review/16150
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 
-commit 5b088af
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Dec 27 10:49:26 2014 -0500
+commit e702da6
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Jun 26 08:09:49 2016 -0700
 
-    Eliminate proto_tree_add_text from packet-spice.c
+    [Automatic update for 2016-06-26]
     
-    Also do some cleanup in dissect_spice() and replace g_warning calls.
+    Update manuf, services enterprise-numbers, translations, and other items.
     
-    Change-Id: I4dc6f6496bb5ae54157aa6f7f27f21c396da623c
-    Reviewed-on: https://code.wireshark.org/review/6106
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: Id5cc1bbd3d7f899e48ae9c2de48613ef0366cc29
+    Reviewed-on: https://code.wireshark.org/review/16142
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 5f2b998
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Sun Dec 28 18:03:49 2014 +0000
+commit 5e8649b
+Author: Gerald Combs <gerald@zing.org>
+Date:   Sat Jun 25 10:12:21 2016 -0700
 
-    Minor doc updates, added Windows debugging info
+    Qt: Don't use QStyleOptionViewItemV4.
     
-    Change-Id: I7ddd6f8dead5db725c4e5f35778ce4b6f792bda9
-    Reviewed-on: https://code.wireshark.org/review/6096
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
+    It was deprecated in Qt 5.7. Just use QStyleOptionViewItem.
+    
+    Change-Id: I890305a11393940e21bdc68d90ca6602ade16769
+    Reviewed-on: https://code.wireshark.org/review/16137
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit e8ec11f
-Author: Gerald Combs <gerald@zing.org>
-Date:   Mon Dec 22 15:51:36 2014 -0800
+commit 4addfc6
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jun 24 16:48:23 2016 -0700
 
-    Qt: Add a WiresharkDialog convenience class.
+    Add an RA_INTERFACES register action.
+    
+    Add RA_INTERFACES between RA_PREFERENCES and RA_CONFIGURATION. Wireshark
+    was spending a suspiciously long time loading module preferences here.
+    (Now we just need to find out why that section of the code is slow.)
     
-    Add WiresharkDialog, a common base class for dialogs centered around
-    capture files. Make it a parent of Capture File Properties, Traffic
-    Table, Conversations, and Endpoints.
+    Change-Id: Iecbe55e8e10c8844bcb151a13e383cb13a3f6eb1
+    Reviewed-on: https://code.wireshark.org/review/16133
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 60cdee9
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jun 24 15:17:25 2016 -0700
+
+    Qt: Handle unhandled filter actions.
     
-    Rename CaptureFile::read_only_ to file_closed_. Add methods to
-    WiresharkApplication for generating consistent window titles.
+    Handle FilterAction::ActionColorize and ::ActionFind. Remove
+    ::ActionConversation since it was unused. Assert when we encounter a
+    missing FilterAction, similar to what we do in other parts of the code.
     
-    Change-Id: Idc771556d8192e60f85dddc08fc4757698dee257
-    Reviewed-on: https://code.wireshark.org/review/6097
+    Bug: 12363
+    Change-Id: I5c1ecd488e5bdb9700a80fc70ec7c047311054b6
+    Reviewed-on: https://code.wireshark.org/review/16131
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit c1d9d93
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Mon Dec 29 01:03:54 2014 +0000
+commit 291762d
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jun 24 10:52:44 2016 -0700
 
-    Restore string.h to os_version.c
+    Qt: Try to fix un-maximize behavior on OS X.
     
-    Change-Id: I810a38c56829d5d3beaccc0171fc76f26ad79b52
-    Reviewed-on: https://code.wireshark.org/review/6108
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    On OS X, create dialogs with valid parents so that we don't trigger
+    QTBUG-46701. Document QDialog's "on top", maximize, and minimize
+    behaviors.
+    
+    Bug: 12544
+    Change-Id: I32c0ef01dba3f7132e5fd0cd61f9feb654b92009
+    Reviewed-on: https://code.wireshark.org/review/16127
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 85781bb
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Mon Dec 29 00:28:26 2014 +0000
+commit 974a530
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Jun 23 13:10:52 2016 -0700
 
-    Add back string.h to sha1.c and sober128.c
+    Qt: Conversation and Endpoint dialog performance tweaks.
     
-    Change-Id: Idd8963717eab804f7d76652d1baf029be8b5997f
-    Reviewed-on: https://code.wireshark.org/review/6105
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Generate column text dynamically. This keeps us from having to iterate
+    over our tree items each time we receive updates.
+    
+    Set the uniformRowHeights property.
+    
+    Stop automatically resizing columns after 200 items.
+    
+    Fixup name resolution behavior. Disable the checkbox if host name
+    resolution is disabled.
+    
+    Change-Id: Ib2fef604d6ee9e39a8b1edd72d58d0cb02d3bb64
+    Reviewed-on: https://code.wireshark.org/review/16110
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 8ae669c
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Mon Dec 29 00:16:03 2014 +0000
+commit 01e2280
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jun 23 17:52:51 2016 +0200
 
-    Restore string.h to md4.c
+    circuit: rename shadow variable
     
-    Change-Id: I1a2c57ea20bcb1fd22c0379f3f43d3589e497c1b
-    Reviewed-on: https://code.wireshark.org/review/6104
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Change-Id: I67e2c80e89af9526ba4b482933d64cab93b9490a
+    Reviewed-on: https://code.wireshark.org/review/16105
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 30edb91
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Mon Dec 29 00:11:36 2014 +0000
+commit 12efbd6
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jun 23 17:53:45 2016 +0200
 
-    Add string.h back to rc4.c
+    app_mem_usage: rename shadow variable
     
-    Change-Id: Idea9369742373e4a50edb3f391bdabfeeb3a2ca7
-    Reviewed-on: https://code.wireshark.org/review/6103
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Change-Id: I0db888633118beeabfe4bb8fa6da419d0827c7c1
+    Reviewed-on: https://code.wireshark.org/review/16106
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 518e48d
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Mon Dec 29 00:08:12 2014 +0000
+commit f8500f3
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jun 23 17:51:41 2016 +0200
 
-    Add back string.h
+    conversation: rename shadow variable
     
-    Change-Id: Ia61c72c7e8d1ef92ec5a38d534620fc225eef365
-    Reviewed-on: https://code.wireshark.org/review/6102
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Change-Id: I8f738b2e01d7f448b21cdc1b488b16b7dd581911
+    Reviewed-on: https://code.wireshark.org/review/16104
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit f215575
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Sun Dec 28 23:56:13 2014 +0000
+commit 46fc6f5
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jun 23 17:40:40 2016 +0200
 
-    Add a couple of more needed includes
+    ex-opt: rename shadow variable
     
-    Change-Id: Ie160f81544c6c9b381078b555e91602617cb2700
-    Reviewed-on: https://code.wireshark.org/review/6101
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Change-Id: Iba19920e58ffb7f1a88c2a75964c518f0479c66f
+    Reviewed-on: https://code.wireshark.org/review/16103
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 5efc18e
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Sun Dec 28 23:45:56 2014 +0000
+commit 916958c
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jun 23 17:39:43 2016 +0200
 
-    Restore string.h as OS X misses it for strlen()
+    filter: rename shadow var
     
-    Change-Id: If1a968d54eed97fae915b8546d8d7a65a56b82db
-    Reviewed-on: https://code.wireshark.org/review/6100
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Change-Id: Idc18f2988754fc21b1f8f2dcadfe5e3dd31d5545
+    Reviewed-on: https://code.wireshark.org/review/16102
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit e3efb80
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Sun Dec 28 00:25:44 2014 +0000
+commit bfb6f62
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jun 23 17:35:17 2016 +0200
 
-    Deleting unnecessary #includes from wsutil.
-    
+    srt: rename shadow variable
     
-    Will look at cleaning up and committing script afterwards.
-    
-    Change-Id: Id785e581740ab62fe9258ecfcb0926761ad9c527
-    Reviewed-on: https://code.wireshark.org/review/6086
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Change-Id: I69bda25f79b6b46bdb288e32133847a853b614e0
+    Reviewed-on: https://code.wireshark.org/review/16101
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 016769d
-Author: Hadriel Kaplan <hadriel@128technology.com>
-Date:   Thu Dec 25 10:17:11 2014 -0500
+commit b845e29
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jun 23 17:31:49 2016 +0200
 
-    Expose dissector_add_for_decode_as() to Lua
-    
-    Allow Lua scripts to add their Protocol's dissector for "Decode as...".
+    stats_tree: rename shadow variable
     
-    Bug: 10696
-    Change-Id: Ic270cc85eff62ccfc29d8e5fcbb48247cfcd14bd
-    Reviewed-on: https://code.wireshark.org/review/6050
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I5b3272cc4df728c70d6b0370b0d8a6d3482a0c6c
+    Reviewed-on: https://code.wireshark.org/review/16100
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 5e16157
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Sat Dec 27 15:39:40 2014 +0100
+commit 581d44f
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jun 23 17:15:34 2016 +0200
 
-    p_mul: Added checksum from ACP 142(A)
+    h248: rename shadow variable.
     
-    Bug: 10807
-    Change-Id: Ifd1ea5d67b65a7e7997458785fff95cc471e0dbc
-    Reviewed-on: https://code.wireshark.org/review/6076
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
+    Change-Id: I98545776127a0cc3b5d9c44bb625a217672b4443
+    Reviewed-on: https://code.wireshark.org/review/16099
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 71c02b2
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Dec 24 00:06:35 2014 -0500
+commit b47aca5
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jun 24 16:01:51 2016 -0700
 
-    Create FT_FCWWN field type.
+    Minor UI locale updates.
     
-    Also, convert the "string" hf_ entries that used tvb_fcwwn_to_str as a string to use proto_tree_add_item with FT_FCWWN type.
+    Qt: Call setlocale before commandline_early_options so that we get
+    proper "-v" output, similar to the GTK+ UI.
     
-    Change-Id: I4ca77870499fd8239584a70874998b5d194a7167
-    Reviewed-on: https://code.wireshark.org/review/6036
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8965e90
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Dec 28 16:35:57 2014 +0100
-
-    Qt Follow window: keep data representation when switching between streams
+    GTK+: Call setlocale once at startup.
     
-    Change-Id: I1c7092d33d841e80ce110224f3bd617cb112be61
-    Reviewed-on: https://code.wireshark.org/review/6091
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Bug: 11960
+    Change-Id: I3c3a196b9d94fc768e1085200891bc8d67e21a08
+    Reviewed-on: https://code.wireshark.org/review/16132
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: João Valverde <j@v6e.pt>
 
-commit f3fd6b5
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Dec 28 18:39:30 2014 +0100
+commit 79836fa
+Author: Roland Knall <roland.knall@br-automation.com>
+Date:   Thu Jun 23 10:43:30 2016 +0200
 
-    The symbol rate in the Cable Delivery System Descriptor is in Mega-Symbols/s
+    wsutil: Move Win32 helper routines from capchild
     
-    Change-Id: I1446500f1c5c89b8ed94c04b04bb6985ae827731
-    Reviewed-on: https://code.wireshark.org/review/6095
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    Move error handling and argument quoting routines from
+    capchild to wsutil, as those methods will be used by
+    extcap_spawn as well.
+    
+    Change-Id: I2c4515fefd5aecad317fcdaefa721734288f792c
+    Reviewed-on: https://code.wireshark.org/review/16123
+    Petri-Dish: Roland Knall <rknall@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: João Valverde <j@v6e.pt>
+    Reviewed-by: Roland Knall <rknall@gmail.com>
 
-commit 15a9f5d
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Sat Aug 23 00:21:45 2014 +0100
+commit fe68566
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jun 24 12:59:07 2016 -0700
 
-    Move Windows build to be VS2013 based using the Community Edition
-    Drop references to long obsolete compilers.
-    Added Chocolatey installer instructions for some packages.
+    Qt: Fix "-l" behavior.
     
-    Change-Id: I416d4091b6acaa1ed0d5e586f0427708c4b2d646
-    Reviewed-on: https://code.wireshark.org/review/5986
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
+    gbcae998 didn't completely fix the missing "-l" behavior.
+    
+    Bug: 12311
+    Change-Id: Iee3c844013ac137e94848aaafca7aeb3de43e080
+    Reviewed-on: https://code.wireshark.org/review/16128
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 1b6da9e
+commit cc007e5
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Dec 28 08:05:15 2014 -0800
+Date:   Fri Jun 24 08:59:48 2016 -0700
 
-    [Automatic manuf, services and enterprise-numbers update for 2014-12-28]
+    Qt: Keep the syntax line edit cursor active.
     
-    Change-Id: Ie1876a971a25a4c8f063ae0fce0c970a4c9efdf2
-    Reviewed-on: https://code.wireshark.org/review/6092
+    Ignore focusOutEvents when the syntax line edit completer is active.
+    This keeps it from hiding its cursor.
+    
+    Bug: 12520
+    Change-Id: I8e25b92c097e039e26e2381c5209be1e27a6a7cd
+    Reviewed-on: https://code.wireshark.org/review/16126
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Tested-by: Jim Young <jim.young.ws@gmail.com>
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 1d598bb
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Dec 21 12:38:13 2014 -0500
+commit 4adf695
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Fri Jun 24 14:13:06 2016 +0200
 
-    Replace ip6_to_str and ip6_guint8_to_str with address_to_str and tvb_ip_to_str.
+    print(.c): fix indent
     
-    Change-Id: I1d258923a7a63539ec8456d3e306bca5016a1e4b
-    Reviewed-on: https://code.wireshark.org/review/6060
+    Change-Id: Ie7c55fb432b29abe689eed1968cfa30bd8e88e33
+    Reviewed-on: https://code.wireshark.org/review/16124
     Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 9fce4dd
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Dec 28 02:28:27 2014 -0800
+commit 1df9918
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jun 23 18:21:13 2016 +0200
 
-    If we can't open the GeoIP database, close and unlink the map file.
+    tfshark: remove unused variable
     
-    We can't write out the full map file, and we return an error, so just
-    get rid of the file.
+    Change-Id: I30ab3e4e044de12b18b7b7213a605df7096d1c54
+    Reviewed-on: https://code.wireshark.org/review/16108
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit 71a57dc
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Thu Jun 23 18:51:25 2016 -0700
+
+    Indicate how this should be done.
     
-    Fixes Coverity CID 1256521.
+    Assuming that it could, if registered as an "eth.trailer" heuristic
+    dissector, get the length of the entire frame, that is.
     
-    Change-Id: Ieee078f760c035d65b2fce199ea472ba915be9c6
-    Reviewed-on: https://code.wireshark.org/review/6090
+    Change-Id: I1ac26feeb10bb8ba357089a80f4b768f580bb51d
+    Reviewed-on: https://code.wireshark.org/review/16121
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 120628e
+commit a5e9e7e
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Dec 28 02:18:05 2014 -0800
+Date:   Thu Jun 23 12:45:32 2016 -0700
 
-    Don't check the same character twice in a row, check it and the next character.
+    Fix "disable this protocol by default".
     
-    Fixes Coverity CID 1260460.
+    Allow a dissector to mark its protocol as "disabled by default", which
+    means that the "enable all protocols" routine won't enable it.  This is
+    necessary in order to allow the disabling of protocols not to be
+    unintentionally changed due to profile changes; see bug 9826.
     
-    Change-Id: Ic9ed109a863bcf20a5e67e4f52d628011f5e9ba5
-    Reviewed-on: https://code.wireshark.org/review/6087
+    Change-Id: I3947f794c21350b70a8de06899cfc7715b77f90f
+    Ping-Bug: 9826
+    Reviewed-on: https://code.wireshark.org/review/16109
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 63ebe91
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Dec 26 23:48:39 2014 +0100
+commit dd5f3c9
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Thu Jun 23 16:10:09 2016 +0200
 
-    Removed duplicated #include lines
+    LTE RRC: fix display of info column when receiving a BR SIB
     
-    Change-Id: I9cafa3cd5c74121168777d8c656e7e94e89efd3c
-    Reviewed-on: https://code.wireshark.org/review/6065
+    Change-Id: Ic288cb10fad3bd34fe088479e7a79f77985808e0
+    Reviewed-on: https://code.wireshark.org/review/16098
     Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit d094fca
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Dec 27 15:17:07 2014 -0800
+commit 45db2fb
+Author: Benjamin Coddington <bcodding@redhat.com>
+Date:   Thu Jun 23 05:57:03 2016 -0400
 
-    Check for pkg-config.
+    packet-nfs: add extent decoding for SCSI layouts
     
-    The configure script uses pkg-config unconditionally, so you need it if
-    you're going to build Wireshark with the autotools.
+    Decode extents sent within the response to a LAYOUTGET operation on
+    SCSI layout types.
     
-    Change-Id: Ibb0e5e37651256c7134303c8176f30a9150af699
-    Reviewed-on: https://code.wireshark.org/review/6085
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I1fc0a5e3d4782f078f96866dc63f2ec43b6d62b1
+    Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
+    Reviewed-on: https://code.wireshark.org/review/16097
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 73af2d6
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Dec 27 15:02:56 2014 -0800
+commit 738b3e8
+Author: dz-msfc <zollerd@gmail.com>
+Date:   Wed Mar 2 20:39:12 2016 -0600
 
-    We require pkg-config to check for, for example, GLib.
-    
-    If the check for pkg-config fails, quit immediately; don't leave the
-    failure message for later, as the error message in question might not be
-    as blunt.
+    NASA provided LTP and DTN updates
     
-    Change-Id: I530e8b62f5adff228ae8ff6f9798ac538c2ad684
-    Reviewed-on: https://code.wireshark.org/review/6084
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I49769271a41b6a7b23c6bc1d4beaadbe8819198d
+    Reviewed-on: https://code.wireshark.org/review/14310
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 51e5869
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Dec 27 12:56:07 2014 -0800
+commit edac72e
+Author: Jens Kilian <jens.kilian@advantest.com>
+Date:   Thu Jun 23 10:31:42 2016 +0200
 
-    Get rid of packet data members of header structures.
-    
-    Instead, have a special macro using the size of the header structure to
-    find the offset of the packet data.
+    Increase MAX_DISSECTOR_ADDR_TYPE.
     
-    This means that:
+    With the recent changes causing some address types to be registered
+    by their proper dissectors, I ran into the MAX_DISSECTOR_ADDR_TYPE
+    limit in a new dissector I'm currently writing.
     
-       1) you don't have to throw "-{size of data member}" into the
-          macros that calculate the sizes of the header structures;
+    Change-Id: I72f521266af9190e8ad198ace4d6608b6b4d2dee
+    Reviewed-on: https://code.wireshark.org/review/16091
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 982359c
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jun 23 10:13:15 2016 +0200
+
+    bthci: add missing break (CID 1362832)
     
-       2) you don't have a bunch of randomly-chosen data field sizes;
+    Change-Id: I705cb17d7c6d615361d29f00ba840a94dc835ff0
+    Reviewed-on: https://code.wireshark.org/review/16090
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+
+commit a51b6a6
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Thu Jun 23 02:33:46 2016 -0700
+
+    Fix some of the brokenness in the PRP redundancy control trailer dissector.
     
-       3) you don't have sizes of 0, which cause problems with
-          compilers that don't support zero-length arrays;
+    IF YOU ARE DOING A HEURISTIC CHECK TO DETERMINE WHETHER THE PACKET
+    YOU'RE LOOKING AT IS ONE YOU SHOULD DISSECT, EVEN IN A DISSECTOR
+    THAT'S NOT REGISTERED AS A HEURISTIC DISSECTOR, DO NOT LOOK AT PACKET
+    BYTES UNLESS YOU HAVE ALREADY DETERMINED THAT THEY ARE AVAILABLE IN THE
+    CAPTURE.
     
-       4) you don't have some apparently-incorrect "-{size of data
-          member}" values (if they're correct, please fix the structure
-          definitions).
+    THERE ARE NO EXCEPTIONS TO THIS RULE.
     
-    Change-Id: Iea368b83fa2d184bd6df453d51756e4749714e2c
-    Reviewed-on: https://code.wireshark.org/review/6082
+    Bug: 9826
+    Change-Id: I2327a92ee760003bc10489263c0c53acdf2094e9
+    Reviewed-on: https://code.wireshark.org/review/16092
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit ea6f5a3
-Author: Hadriel Kaplan <hadriel@128technology.com>
-Date:   Sat Dec 27 13:29:06 2014 -0500
+commit 6b0923a
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Thu Jun 23 01:00:26 2016 -0700
 
-    Zebra dissector highlights wrong byte for version and is missing some fields
+    No pcap, no live capture, so no auto_scroll_live.
     
-    Bug: 10809
-    Change-Id: I916d3ee0644570b689b35575e7277fc7d5ee3396
-    Reviewed-on: https://code.wireshark.org/review/6081
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
-    Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
+    Change-Id: Ic1993916cdb78c946bb291fa59f7cdc25e9cef2d
+    Reviewed-on: https://code.wireshark.org/review/16088
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 25c7e0d
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Dec 27 16:46:32 2014 +0100
+commit 2c8056a
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Mon Jun 13 20:02:46 2016 +0200
 
-    OpenFlow: fix dissection of async_config_prop structure
+    Qt: quit the UI if WIRESHARK_QUIT_AFTER_CAPTURE is set (offline mode too).
     
-    Bug: 10808
-    Change-Id: I5ef46cd6b85c415e23dfdbe7a56c8b332eaae5a3
-    Reviewed-on: https://code.wireshark.org/review/6078
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    This change is useful to use the offline mode in tests (like fuzzing)
+    that require the software to quit after the processing of a sample.
+    
+    Change-Id: I311c642edecf4012dc518c2bf8bca66c97aa1b02
+    Reviewed-on: https://code.wireshark.org/review/16038
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 1ae0c4a
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Dec 27 15:42:53 2014 +0100
-
-    Fix -z statistics command line parsing
-    
-    The string comparison must be done against the length of the registered command, not against the length or the string given as an argument.
-    Otherwise optional parameters are taken into account.
-    
-    Change-Id: Iec4032fc10b00e606770533c5a567d7b49663593
-    Reviewed-on: https://code.wireshark.org/review/6075
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 0ea310d
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Dec 27 16:34:54 2014 +0100
-
-    SRVLOC: fix some fields registration (regression introduced in ga1c6341)
-    
-    Change-Id: I318f4889b94021ece1e61ae080b77b1fb21eae7b
-    Reviewed-on: https://code.wireshark.org/review/6077
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit a1c6341
+commit bf29a5c
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Dec 26 21:13:48 2014 -0500
+Date:   Thu Jun 23 00:30:51 2016 -0400
 
-    Eliminate proto_tree_add_text from packet-srvloc.c
+    Add LACP "flag strings"
+    
+    Merged the functionality of a Lua script from Sharkfest '16
+    presentation into the dissector.
+    Also cleaned up some of the tfs values used by the dissector.
     
-    Change-Id: I73a2270e259414f21a695d2b279df5b3cac27bb8
-    Reviewed-on: https://code.wireshark.org/review/6067
+    Bug: 12550
+    Change-Id: I6b4c2f4d8a07cfb836265518d713a499df3e971c
+    Reviewed-on: https://code.wireshark.org/review/16086
     Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c04aebd
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Dec 27 02:57:22 2014 -0800
-
-    Declare cur_rt in the narrowest possible scope.
-    
-    Change-Id: I0604d6f9f4bb2c58bb74a9b375f644474b68c28f
-    Reviewed-on: https://code.wireshark.org/review/6074
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit ca6f849
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Dec 27 09:17:36 2014 +0100
+commit 1cdd091
+Author: Chris Brandson <chris.brandson@gmail.com>
+Date:   Fri Jun 17 15:12:12 2016 -0700
 
-    IP: try to fix OSX 10.5 x86 compilation
+    ZigBee updated ZDO support to comply with R22
     
-    packet-ip.c: In function 'dissect_ip':
-    packet-ip.c:2297: warning: 'cur_rt' may be used uninitialized in this function
-    packet-ip.c:2297: note: 'cur_rt' was declared here
+    Update ZDO support for R22 (and IEEE 802.15.4-2015)
+    - Add support for the new IEEE Joining List request / response
+    - Changed Network Update to support channel pages
+    - Added Network Update Enhanced request
+    - Added decoding of EU Sub-GHz Frequency Band
     
-    Change-Id: I97fe33d2a01e982f057cce6d68f64378727be2da
-    Reviewed-on: https://code.wireshark.org/review/6073
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I3a513a486f6d3784897fc8b783411c678e3f905e
+    Reviewed-on: https://code.wireshark.org/review/16040
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 4536271
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 26 18:46:10 2014 -0800
+commit fdcfd3a
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Wed Jun 22 21:10:50 2016 +0100
 
-    Don't use a leading - in getopt_long() option strings.
-    
-    The behavior of a leading - is platform-dependent.  It also means that
-    non-option arguments are treated in a fashion that we're not handling,
-    so capture filters given as non-option arguments at the end of the
-    command line don't work.  (The Linux getopt() man page says that a
-    leading - "is used by programs that were written to expect options and
-    other argv-elements in any order and that care about the ordering of the
-    two."  We are not such a program.)
+    IPv6: Don't check payload length for ICMPv6 encapsulation
     
-    Change-Id: I5610cf90a8218d48f7516abacc367e0affa3b549
-    Based-On-A-Change-From: Peter Hatina <phatina@redhat.com>
-    Reviewed-on: https://code.wireshark.org/review/6071
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I783df2ddc98da1c78020837a32005ea143321990
+    Reviewed-on: https://code.wireshark.org/review/16081
+    Petri-Dish: João Valverde <j@v6e.pt>
+    Tested-by: João Valverde <j@v6e.pt>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: João Valverde <j@v6e.pt>
 
-commit 0a0ce2b
+commit 30f7434
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 26 18:21:05 2014 -0800
+Date:   Wed Jun 22 21:29:20 2016 -0700
 
-    Check for optreset in CMake as well.
+    Squelch some 64-bit-to-32-bit-shortening warnings.
     
-    Change-Id: I74aae1d68f48702b0cd1289cdafdfff8d817b5f4
-    Reviewed-on: https://code.wireshark.org/review/6068
+    Change-Id: I64f833abd11d3b2511c235bb353cb5fb7b813b7f
+    Reviewed-on: https://code.wireshark.org/review/16085
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit eff91ed
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Dec 26 23:39:48 2014 +0100
+commit 300e055
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Jun 22 12:44:02 2016 -0700
 
-    Fix building of color conversation filter
+    Qt: Use queued signals+slots for filter actions
     
-    Right now eth filter (the last one tried) is always applied
+    Many of our dialogs can send an "apply this display filter" signal to
+    the main window. Applying a display filter in turn creates a nested
+    event loop via cf_read+update_progress_dlg. If the "apply" signal+slot
+    is directly connected (which is the default, and which means we're
+    calling into a function table) we can close the dialog while the signal
+    is firing, which means we return into a deleted object.
     
-    Change-Id: Ibe5d3c30033bd2d385bd1e68b20388114673cb5c
-    Reviewed-on: https://code.wireshark.org/review/6064
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Make all of the filterAction signals+slots queued instead of direct.
+    
+    Bug: 12523
+    Change-Id: Ica331054c0aa52a7f33bd8df1fa65ecd09fdc292
+    Reviewed-on: https://code.wireshark.org/review/16080
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit c2c9a09
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 26 14:37:31 2014 -0800
+commit 933c079
+Author: Uli Heilmeier <uh@heilmeier.eu>
+Date:   Thu Jun 16 14:03:04 2016 +0200
 
-    Use getopt_long() for the first pass through the argument list.
+    HTTP: Split URI into path and query. Tokenize parameters.
     
-    That way:
+    Split a HTTP URI into path and query.
+    Tokenize the parameters of a query.
     
-       1) we don't have to worry about the system getopt() and our
-          getopt_long(), on platforms that have getopt() but not
-          getopt_long() (Solaris prior to Solaris 10, HP-UX, AIX), not
-          working well together;
-    
-       2) if necessary, we can handle long options in the first pass.
-    
-    Switch to using getopt_long() for the *second* pass for the GTK+ version
-    of Wireshark.
-    
-    Use the documented mechanism for resetting the argument parser for the
-    glibc version of getopt_long(); use the mostly-undocumented-but-at-least-
-    they-documented-optreset mechanism for the *BSD version.
+    Bug: 12514
+    Change-Id: I9892914eba9737c9751936ce62e63497aba61c61
+    Reviewed-on: https://code.wireshark.org/review/15971
+    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit fea6e73
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Fri Jun 17 20:41:31 2016 -0400
+
+    RTP player: increase the maximum number of silence frames to 30 minutes worth.
     
-    (We should look into doing only one pass, saving away arguments that
-    can't fully be processed in the first pass for further processing after
-    initializing libwireshark.)
+    The BadAlloc X11 crash I reported in bug 4119 (which is why the limit was as
+    low as it was) has long since been fixed thanks to
+    bug 2630/I71e1bd2f9a62792db06ce887e2bbe7a96d110e0a so we can now deal with
+    more silence frames.
     
-    Change-Id: Ide5069f1c7c66a5d04acc712551eb201080ce02f
-    Reviewed-on: https://code.wireshark.org/review/6063
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I0127381e71e497560e0f23af04f9d96af1ed6335
+    Ping-Bug: 5902
+    Ping-Bug: 4119
+    Ping-Bug: 2270
+    Reviewed-on: https://code.wireshark.org/review/16003
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 2c6d2bb
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Dec 26 23:21:35 2014 +0100
+commit bcae998
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Jun 22 14:41:16 2016 -0700
 
-    UDP: fix 'Follow Stream' button from conversations tab
+    Qt: Support the -j, -J, and -l command line flags
     
-    Add stream index to conversation table
+    Add support for -j, -J, and -l. Mark the -m flag deprecated.
     
-    Change-Id: Id63b2cc0000d89297c8638b9a89315096fc5458b
-    Reviewed-on: https://code.wireshark.org/review/6062
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Bug: 12546
+    Change-Id: Ic44b3997840018e5d571aa1813a1646bce11d4a6
+    Reviewed-on: https://code.wireshark.org/review/16083
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit a2beef9
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Dec 26 23:09:04 2014 +0100
+commit 18a900f
+Author: John A. Thacker <johnthacker@gmail.com>
+Date:   Mon Jun 20 16:29:49 2016 -0400
 
-    Fix assertion when applying conversation color
+    Editcap: Fix setting of max_packet_number
     
-    Packet scoped memory cannot be used here; let's use the pinfo pool
+    editcap -r only sets max_packet_number to the earliest, instead of latest,
+    packet or end of range selection. This changes it to the proper test.
     
-    Change-Id: If76605f7a3021f5900fd46ce7d1c642a518c902f
-    Reviewed-on: https://code.wireshark.org/review/6061
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Bug: 12547
+    Change-Id: I81772962b00fc6566ccead4fb44c6626a47fff31
+    Reviewed-on: https://code.wireshark.org/review/16045
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit ea6a578
+commit 63027fc
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Dec 26 22:43:55 2014 +0100
+Date:   Tue Jun 21 15:31:39 2016 +0200
 
-    Try to fix compilation broken by g3d3f973
+    Windows: rename wiretap-${PROJECT_VERSION}.dll to libwiretap.dll
     
-    Change-Id: I26833e9a4f7557b5824effaff16b38d2c4367772
-    Reviewed-on: https://code.wireshark.org/review/6059
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 3d3f973
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Dec 21 08:02:26 2014 -0500
-
-    Replace ip_to_str with [ep_]address_to_str and tvb_ip_to_str.
+    This aligns the name with what is done for other Wireshark shared libraries.
+    Moreover it allows to compile a wiretap plugin once per major release, without
+    the need to recompile it each time ${PROJECT_VERSION} changes (each nightly
+    build / official release).
     
-    Change-Id: I40d0c8253743183aecef252040b7dd6742ae5c71
-    Reviewed-on: https://code.wireshark.org/review/5934
+    Change-Id: I53c82277223a4f323079cf695168ac85c2fba523
+    Reviewed-on: https://code.wireshark.org/review/16058
+    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: Michael Mann <mmann78@netscape.net>
 
-commit b68fb9b
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Dec 24 10:44:03 2014 -0500
+commit a9a306f
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Wed Jun 22 01:28:48 2016 -0400
 
-    Fix some dissectors doing termio (fprintf(stderr,..), g_warning()).
+    Don't close Wireshark (GTK) if user cancels Save on Close.
     
-    - Use report_...failure() (in most cases).
-    - Also: Do some misc fixes in certain disectors
-      - re-arrange order of #includes
-      - Fixup preferences help text
-    
-    Change-Id: I385f6f97257f365f53ce611df02f57f9257dc5f9
-    Reviewed-on: https://code.wireshark.org/review/6039
-    Petri-Dish: Bill Meier <wmeier@newsguy.com>
+    Bug: 9635
+    Change-Id: I4a6e3ca676f1c1096521c0a8147a1459777c92fa
+    Reviewed-on: https://code.wireshark.org/review/16075
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 4cf6583
+commit 92ea291
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Dec 26 09:44:30 2014 -0500
+Date:   Wed Jun 22 10:56:07 2016 -0400
 
-    Remove proto_tree_add_text from ZigBee dissectors.
+    Don't close Wireshark (Qt) if user cancels Save on Close.
     
-    Change-Id: I0488cb0ab33f2cc6dee227f1bfacec58eafc4190
-    Reviewed-on: https://code.wireshark.org/review/6055
+    Bug: 9635
+    Change-Id: I8c73c839419cd4bcb850824ffb42bf72eed50b19
+    Reviewed-on: https://code.wireshark.org/review/16076
     Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit a442a1c
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Dec 26 19:52:38 2014 +0100
+commit d9fb7f9
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Jun 20 09:41:10 2016 -0700
 
-    WCCP: initialize address table to 0
+    Handle ENAMETOOLONG.
     
-    It prevents an uninitialized access later on if an exception is triggered before filling the table
+    g_strerror doesn't appear to handle ENAMETOOLONG. Check for it ourselves.
     
-    Bug: 10806
-    Change-Id: I8f75fb18cd8d033013c34093f9d6c8762f23452b
-    Reviewed-on: https://code.wireshark.org/review/6056
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: Icd113a81e8d95bb3c84c91bb420a1a6a19bf5d40
+    Reviewed-on: https://code.wireshark.org/review/16041
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit f2224bc
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Dec 10 01:52:31 2014 -0500
+commit be303c2
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Jun 22 16:26:56 2016 -0700
 
-    rpc: Prevent "malformed" for RPC 'NULL proc' packets.
+    No GeoIP, no need for geoip_none_.
     
-    Bug: 10646
-    Change-Id: Ifb96768969a43c59367b73e7bb940ceeb02cf6b0
-    Reviewed-on: https://code.wireshark.org/review/5700
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I6fb328d07718d2ff7a7d6008c936b7478ea6db3f
+    Reviewed-on: https://code.wireshark.org/review/16084
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit adb81f3
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Thu Dec 25 22:34:06 2014 +0000
+commit f9cf660
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Jun 22 10:56:30 2016 -0700
 
-    Deleting unnecessary #includes from dissectors.
-    Fifth batch (packet-rtp.c -> end).
+    Qt: Fix crash in Conversations and Endpoints dialogs
     
-    Will look at cleaning up and committing script afterwards.
+    Don't assume that conv_item_t or hostlist_talker_t pointers never
+    change. GArrays can reallocate their data, and in our case this can
+    happen when we have more than 10,000 items (which is the size that the
+    conversation table code passes to_array_sized_new).
     
-    Change-Id: I8ed61dc941d98d3f7259a9d1f74e214eb7b4bfa2
-    Reviewed-on: https://code.wireshark.org/review/6052
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Bug: 12288
+    Change-Id: I88e58be830e35dde272f81fe9250b054fb87facf
+    Reviewed-on: https://code.wireshark.org/review/16078
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 9c7c72d
+commit 692e2b6
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Dec 22 22:50:49 2014 +0100
+Date:   Wed Jun 22 21:08:57 2016 +0200
 
-    VoIP Calls: Missing break in switch (CID 1155515)
+    SSH: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
     
-    Change-Id: Ie62cd2901c791490fe6685f560815e09b921d03b
-    Reviewed-on: https://code.wireshark.org/review/6001
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: If084278acfeb82ae7c91aefff9035f156e8f4f15
+    Reviewed-on: https://code.wireshark.org/review/16079
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Kenny Root <kenny@the-b.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit e08eba9
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Dec 25 13:03:09 2014 -0800
+commit e82d0ae
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Jun 21 16:23:04 2016 -0700
 
-    Only include <wsutil/os_version_info.h> if we need it.
+    Qt: Make the syntax line edit less greedy.
     
-    Change-Id: Idee0e7205969ac2e7b33c4748a1463a0bfffe0a6
-    Reviewed-on: https://code.wireshark.org/review/6051
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    In SyntaxLineEdit::event, only grab ShortcutOverride events that have
+    Ctrl+Alt modifiers. When the main window display filter edit has focus
+    this should let us use text editing shortcuts and most main window
+    shorcuts as appropriate. "Most" means everything except for time display
+    formats. We might want to use something other than Ctrl+Alt for their
+    modifiers.
+    
+    Bug: 12533
+    Ping-Bug: 12270
+    Change-Id: I61eb86b80b4237e6907d5e50262b8f5c291b27a7
+    Reviewed-on: https://code.wireshark.org/review/16065
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit ceeeea0
-Author: Hadriel Kaplan <hadriel@128technology.com>
-Date:   Mon Dec 22 19:14:49 2014 -0500
+commit d46daa1
+Author: Balint Reczey <balint@balintreczey.hu>
+Date:   Thu Jun 16 15:09:56 2016 -0700
 
-    Lua accessor for Protocol field type gets wrong data
+    GTK: Keep display filter applied when switching profiles
     
-    When a Lua dissector/tap accesses the value of a Field of FT_PROTOCOL ftype, the
-    returned ByteArray contains the wrong data.  Also, calling such a field's
-    tostring() method returns a string of "(unknown)" instead of the hex of the
-    data.
-    
-    Bug: 10801
-    Change-Id: I8a0642dc0e41af444d211bbe4106cd21207084a6
-    Reviewed-on: https://code.wireshark.org/review/6003
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Bug: 6130
+    Change-Id: I3bcd6aaad33482474e3429e0dcc074973a338fca
+    Reviewed-on: https://code.wireshark.org/review/15992
+    Petri-Dish: Balint Reczey <balint@balintreczey.hu>
+    Tested-by: Balint Reczey <balint@balintreczey.hu>
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
-    Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 2391a43
-Author: Hadriel Kaplan <hadriel@128technology.com>
-Date:   Wed Dec 24 15:04:01 2014 -0500
+commit 0bf1cb2
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Jun 21 22:23:05 2016 -0400
 
-    Bug 10233 - Wireshark crashes if Lua heuristic dissector returns true
+    Add address_to_bytes API.
     
-    Because call_heur_dissector_direct() didn't set the pinfo->heur_list_name
-    before calling the heuristic dissector, heur_dissect_lua() would invoke
-    report_failure().  Unfortunately, calling report_failure() within a dissector
-    can cause problems because GTK continues invoking timed callbacks while
-    it displays the modal dialog created by report_failure()... without yet
-    returning from report_failure().  In such a case, it's possible for
-    epan_dissect_run() to be called while still within the execution of a
-    previous call to epan_dissect_run(), which casues an assert since
-    epan_dissect_run() is not reentrant.
+    This will copy an address's "byte format" into a buffer.  The original
+    intended design is for export_pdu functionality, which tries to do
+    this "manually" for many address types (and creates undesired dependencies)
     
-    So this commit both fixes the call_heur_dissector_direct() bug as well
-    as avoids using report_failure() within heur_dissect_lua().  It also
-    upadtes the dissector.lua script used in the testsuite to match the one
-    pubshied on the wiki, since that script's heuristic dissector triggered
-    the bug.
+    The default functionality if a "byte format function" isn't provided
+    (currently the case for all address types) is a memcpy of the address
+    data.  Providing "address to byte" functions to aid export PDU
+    functionality will be provided later.
     
-    Bug: 10233
-    Change-Id: If022604347745fadac01c02d370ca1a5d3f88b5b
-    Reviewed-on: https://code.wireshark.org/review/6040
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I3703f9e617a8cef09165ad53a0f98c6372676b9b
+    Reviewed-on: https://code.wireshark.org/review/16070
     Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
-    Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
-
-commit de8c81c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Dec 25 01:13:24 2014 -0800
-
-    Use getopt_long().
-    
-    Change-Id: I8ff74de7cedee64bc46d88f23a6d1e771d4a4a10
-    Reviewed-on: https://code.wireshark.org/review/6048
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 20503c7
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 24 17:10:40 2014 -0800
+commit c664f72
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Jun 21 15:13:30 2016 -0700
 
-    Check for getopt_long(), not getopt().
-    
-    We support three types of platforms:
+    Qt: Clear the packet list selection before freezing it.
     
-       1) UN*Xes that have both getopt() and getopt_long();
+    Call selectionModel()->clear() before removing our model. This will
+    hopefully make sure we don't end up with an invalid selection in
+    selectionChanged().
     
-       2) UN*Xes that have getopt() but not getopt_long();
+    Clear the selection model before clearing the model while we're here.
     
-       3) Windows, which has neither.
+    Change-Id: I1007eeaa480afa0fb31dafc15a49ca6c247b30c8
+    Reviewed-on: https://code.wireshark.org/review/16062
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Kenny Root <kenny@the-b.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit debbf7e
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Jun 21 20:30:35 2016 -0400
+
+    Move AT_VINES address type to VINES dissector.
     
-    Checking for getopt_long() lets us distinguish between 1) and 2) and
-    build getopt_long() for them.
+    proto.c still has to deal with FT_VINES, but maybe that
+    can be refactored to the dissector too.
     
-    Change-Id: Iaf0f142f9bebaa2eed2128d544ec9786711def45
-    Reviewed-on: https://code.wireshark.org/review/6045
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Iee04eed3b75f91cb62bb7b625dd44baeeb9aebb3
+    Reviewed-on: https://code.wireshark.org/review/16069
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit b6f70ed
-Author: Ilya Gavrilov <ilya.dev@gmail.com>
-Date:   Tue Dec 23 19:48:56 2014 +0300
+commit e7b78eb
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Jun 21 20:06:01 2016 -0400
 
-        NBAP: fix ddi missed for non first macdflow_id in E-DCH channel
+    Move AT_USB to inside USB dissector.
     
-    Change-Id: Ib93cac8a4b186114f50ef4a26bdace2d72219644
-    Reviewed-on: https://code.wireshark.org/review/6022
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    This required some hacking in the conversation table handling, but
+    still seemed worth it as USB address is not widely used.
+    Maybe a "is_stringlike" property for address types...
+    
+    Change-Id: I628a15c17cb1f595bb292130867adbc5bea0f41a
+    Reviewed-on: https://code.wireshark.org/review/16068
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 2233ef5
+commit 3ed06ec
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 24 16:13:11 2014 -0800
+Date:   Tue Jun 21 16:34:36 2016 -0700
 
-    Include some files based on whether the functions they define are present.
-    
-    Rather than including wsgetopt.c, inet_aton.c, and strptime.c iff we're
-    building for Windows:
-    
-       include wsgetopt.c iff we don't have getopt();
-    
-       include inet_aton.c iff we don't have inet_aton();
+    The C standard requires <stdlib.h> for getenv() and abort().
     
-       include strptime.c iff we don't have strptime().
+    You might be able to get away with not including it on some or all
+    UN*Xes, but you can't do so on Windows with MSVC.
     
-    Change-Id: Ibd68306ac372a4ae102c3220a94cdf6ecb04e58c
-    Reviewed-on: https://code.wireshark.org/review/6044
+    Change-Id: Id2de70745e2a6e8dedc005a55030f3d3fcb54a69
+    Reviewed-on: https://code.wireshark.org/review/16064
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 153c63d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 24 15:54:47 2014 -0800
+commit 1b1296a
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Wed Jun 22 00:23:38 2016 +0200
 
-    Don't use extra variables for ws_mempbrk_sse42.c and popcount.c
+    More helpful failure when registration fails.
     
-    Instead, just add to WSUTIL_FILES as necessary.
-    
-    Change-Id: Iecadbd9a66ec54ee5d90aecfbfe5e636ae56e27e
-    Reviewed-on: https://code.wireshark.org/review/6043
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I3c574c504cc9166d04b5b725a6a393767a58a280
+    Reviewed-on: https://code.wireshark.org/review/16063
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 
-commit c01bad2
+commit 6cc90dd
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 24 15:36:55 2014 -0800
+Date:   Tue Jun 21 11:21:33 2016 -0700
 
-    Add -msse4.2 to the compiler flags if it's supported.
+    As with dissector_add_uint(), so with dissector_add_{string,guid}.
+    
+    Improve the error message for a null disssector handle.
     
-    Change-Id: I354c5141f8fbe306a71395622effeb97df97f3ce
-    Reviewed-on: https://code.wireshark.org/review/6042
+    Fix indentation while we're at it.
+    
+    Change-Id: I1cb2f8ac52e56fc98f6b3ad981018f571e5a7bf0
+    Reviewed-on: https://code.wireshark.org/review/16060
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 499a7d0
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Dec 24 10:46:41 2014 +0100
+commit d970da4
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Tue Jun 21 19:56:00 2016 +0200
 
-    TCP: TCP Fast Open Cookie is now standardised
-    
-    The kind for TFO is 34
+    Slightly improve error message in case of initialization errors.
     
-    Split dissect TFO option in dedicated function (Using also in TCP Option Experimental with Magic 0xf989)
-    
-    Change-Id: I18ff9ba110fba708a955f448f272ec7c4a7e264e
-    Reviewed-on: https://code.wireshark.org/review/6033
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: Icb5d4f0f3bc60970737abbf62044f4550e8d3ca3
+    Reviewed-on: https://code.wireshark.org/review/16059
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 
-commit 59bdad3
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Wed Dec 24 15:59:59 2014 -0700
+commit c3f3bd7
+Author: Martin Kacer <kacer.martin@gmail.com>
+Date:   Mon Jun 20 11:03:40 2016 +0200
 
-    packet-git.c says it was copied from packet-pop, but that doesn't mean
-    packet-git is for "RFC 1939" (POP3), so remove that comment.
+    tshark JSON and Elasticsearch output fix
+    
+    Fixed json and ek escape function
+    Fixed -j protocol filter to do exact match
+    Fixed -T json to correctly close json
+    Added -j protocol filter also to pdml output
     
-    Change-Id: Ia78ea18beb1a13ab0ad1ad5a87f7b5a887fad918
-    Reviewed-on: https://code.wireshark.org/review/6041
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
+    Bug: 11754
+    Change-Id: I02f274e4a5a02346922b37bbe946c10340c242ea
+    Reviewed-on: https://code.wireshark.org/review/16034
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 1bbe6e6
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Dec 24 10:49:58 2014 +0100
+commit df231d9
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Tue Jun 21 15:30:33 2016 +0200
 
-    TCP: fix indent and reorder Multipath TCP
+    libcodecs and libwsutil are DLLs, not static libraries
     
-    Change-Id: I4ebe474f2a2787c350fe8c4a2de5c35d94d9b064
-    Reviewed-on: https://code.wireshark.org/review/6032
-    Reviewed-by: Matthieu Coudron <mattator@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I4486f35e07c72d4ca35d5649de25d0c9abd2a964
+    Reviewed-on: https://code.wireshark.org/review/16057
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 4b6141b
-Author: Hadriel Kaplan <hadriel@128technology.com>
-Date:   Tue Dec 23 16:34:01 2014 -0500
+commit 8a0b7cc
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Tue Jun 21 15:20:16 2016 +0200
 
-    GIOP dissector doesn't handle two packets in a row
-    
-    Make the GIOP TCP-based dissector correctly handle multiple GIOP
-    messages in a TCP segment, and when the second is malformed.
+    Add a couple of vendor defines.
     
-    Bug: 10760
-    Change-Id: Ie82a1d72a43218e50c6856028a5ef25ad1f0c340
-    Reviewed-on: https://code.wireshark.org/review/6025
+    Change-Id: I252b4f892a539c7fa585615ef636fc26de356bf7
+    Reviewed-on: https://code.wireshark.org/review/16055
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit e03ffe2
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Dec 21 13:51:20 2014 -0500
+commit 6b01909
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Tue Jun 21 15:14:48 2016 +0200
 
-    Replace fc_to_str with address_to_str or tvb_fc_to_str.
+    [H248-Q1950] Correct signal ids.
     
-    Change-Id: I69bf25f5abb9d6ad325f922fab73b6f0cf8ca2ea
-    Reviewed-on: https://code.wireshark.org/review/6035
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: Iafb030313ed3b715a09146d131dfb4ffdcb7961a
+    Reviewed-on: https://code.wireshark.org/review/16054
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit d3888ff
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Dec 24 16:42:23 2014 +0100
+commit 57b6bc1
+Author: Anthony Coddington <anthony.coddington@endace.com>
+Date:   Tue Apr 5 14:21:36 2016 +1200
 
-    RSVP: fix display of unknown Juniper Attribut
+    pcap: ERF per-Host ID/Source ID interface support
     
-    Get "Trying to fetch an unsigned integer with length" when length > 4
+    Add encap_priv pointer to libpcap_t.
+    Initialize erf_priv when ENCAP_ERF.
+    Use erf_populate_interface_from_header() to dynamically create interfaces.
+    Free encap_priv on pcap_close.
     
-    Change-Id: If5e53b826d98f2c30253ea852754f856e1d29088
-    Reviewed-on: https://code.wireshark.org/review/6038
+    Ping-Bug: 12303
+    Change-Id: Ieda425ef3e50a124d9c38ee4538aa3644128ce60
+    Reviewed-on: https://code.wireshark.org/review/15362
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 762bb18
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Dec 24 16:16:26 2014 +0100
+commit d50b981
+Author: Yang Luo <hsluoyz@gmail.com>
+Date:   Thu Jun 16 11:39:32 2016 +0800
 
-    RSVP: Conversations / Endpoint: wrong filter when select a RSVP conversations / endpoint (INVALID == a.x.y.z ...)
+    pcap: Add support to "new" Npcap native mode without setting PATH
     
-    Change-Id: I70f6afd41eefddb42829c3d5f890ea67dcd65537
-    Reviewed-on: https://code.wireshark.org/review/6037
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 04a1f33
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Dec 24 10:25:32 2014 +0100
-
-    test suite: (Minor) fix some double space
+    Npcap decided not to add "C:\Windows\System32\Npcap" to
+    system PATH in the installation any more (starting from
+    Npcap 0.07 r14). So this patch needs to be applied, otherwise
+    Wireshark will not find Packet.dll (the error message will
+    only say wpcap.dll is missing, but actually is Packet.dll
+    missing).
     
-    Change-Id: I7fe7cd7ed471b8fcd2afd5fb4bbc180b580295b3
-    Reviewed-on: https://code.wireshark.org/review/6031
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: Ifd8b6e6d8ecf9866cd37c3368b604de210ff8c7b
+    Reviewed-on: https://code.wireshark.org/review/15959
+    Reviewed-by: Yang Luo <hsluoyz@gmail.com>
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit bfa9ddf
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Dec 22 20:56:15 2014 +0100
+commit 6ccee3e
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Tue Jun 21 08:55:14 2016 +0200
 
-    Qt (pref.gui_layout_type): Missing break in switch (CID 1159202 & 1159203)
+    bthci: Show unknown ocf as undecoded
     
-    Change-Id: I28af99cff5db310ef10258e3054afa7337df1e60
-    Reviewed-on: https://code.wireshark.org/review/5996
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Don't show unknown ocf values as unexpected parameters.
+    
+    Change-Id: I08a6c8c20d6382a847f0a2969e4c523a2873dd6f
+    Reviewed-on: https://code.wireshark.org/review/16048
+    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
+    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 4876016
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Dec 22 20:54:10 2014 +0100
+commit 6ee5464
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Tue Jun 21 08:52:51 2016 +0200
 
-    Qt (KeyPressEvent): Missing break in switch (CID 1159205, 1159206, 1159208, 1159209)
+    packetlogger: Add some info types
+    
+    Add Kernel, Kernel Debug and Error info types.
     
-    Change-Id: I40b7c7eefb269570e6a1c5c9ec310fa97840d42d
-    Reviewed-on: https://code.wireshark.org/review/5995
+    Change-Id: I04547a426b69adde5186e8315a08f4648c1e7837
+    Reviewed-on: https://code.wireshark.org/review/16047
+    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 2d8ec49
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Tue Dec 23 14:58:38 2014 -0700
+commit 9a5cdac
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Fri Jun 17 19:30:57 2016 +0200
 
-    Move twelve show_version() functions from the varoius programs and
-    Wireshark UI files into a single one in wsutil.
+    debian-setup: add additional params to apt-get.
+    
+    Can be used to pass params like -qq and -y for automated installations,
+    like in travis-ci.
     
-    Change-Id: I0a64f0cc8106bd681bd185289c36272c4c43baad
-    Reviewed-on: https://code.wireshark.org/review/6026
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
+    Change-Id: Iddf18829f09ce6b16c1c71264adab38d0a893fe6
+    Reviewed-on: https://code.wireshark.org/review/15999
+    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Dario Lombardo <lomato@gmail.com>
 
-commit 45daef6
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Tue Dec 23 17:55:48 2014 -0700
+commit e6481a9
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Jun 21 01:19:47 2016 -0400
 
-    Put a C comment in dummy.cpp so the user knows where dummy.cpp came from
-    if it is ever created during the build process.
+    Check for negative nanoseconds in io,stat tap.
+    
+    Seconds were already being checked for negative values, but if there is
+    only a fraction of a second, the negative check wasn't being done,
+    which led to bad results.
     
-    Change-Id: Ib3131f63c965ae243f25f98f6209e049323d8360
-    Reviewed-on: https://code.wireshark.org/review/6030
-    Petri-Dish: Stephen Fisher <sfisher@sdf.org>
+    Bug: 9014
+    Change-Id: I820e0a4b1384330acebf4a632a04f7840db2288b
+    Reviewed-on: https://code.wireshark.org/review/16046
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 29d02a3
-Author: Enrico Jorns <ejo@pengutronix.de>
-Date:   Tue Nov 25 10:34:19 2014 +0100
+commit f76af2e
+Author: Jeff Layton <jlayton@redhat.com>
+Date:   Mon Jun 20 15:10:32 2016 -0400
 
-    canopen: Verbosity for INFO column
-    
-    Display basic information about what is going on in the INFO column to
-    ease protocol debugging.
+    ceph: c_dissect_sockaddr doesn't need the "data" pointer
     
-    Change-Id: I2a3aba8008bf65ab9e236a3d81335cf723b2edd0
-    Reviewed-on: https://code.wireshark.org/review/5521
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Change-Id: I8d4ca2e46a556e32e594610fd26c72840783601e
+    Signed-off-by: Jeff Layton <jlayton@redhat.com>
+    Reviewed-on: https://code.wireshark.org/review/16042
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit a0e9fe5
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Dec 22 20:17:46 2014 +0100
+commit fa20f5c
+Author: Rudra Rugge <rrugge@juniper.net>
+Date:   Wed Jun 15 11:32:57 2016 -0700
 
-    TDS: Missing break in switch (CID 280475 & 281377)
+    Add support for Opencontrail virtual network
     
-    Change-Id: I9416e07f497081f7117e8c3ccb741ea601de9cdd
-    Reviewed-on: https://code.wireshark.org/review/5993
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: Ia6012e0f6425be069e222538eafb1191b398ec83
+    Reviewed-on: https://code.wireshark.org/review/15930
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 37773b7
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Tue Dec 23 17:30:21 2014 -0700
+commit 82ed904
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Wed Jan 13 17:49:43 2016 +0100
 
-    Insert URLs for finding Wireshark's dependencies in README.bsd
+    [RNSAP]Update to V13.1.0 (2015-12)
     
-    Change-Id: Idb49181672b83eb4c074409f5b7487cce054833f
-    Reviewed-on: https://code.wireshark.org/review/6029
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
+    Change-Id: I6cb7099ac691d68ddae7be59bf37130c8affad42
+    Reviewed-on: https://code.wireshark.org/review/13263
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit bcbfe79
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Tue Dec 23 16:07:38 2014 -0700
+commit a83f88f
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Mon Jun 20 13:57:11 2016 +0200
 
-    Update README.bsd, mainly to put just the primary dependencies that
-    Wireshark needs and remove the others since GTK2/GTK3/Qt require
-    different things and those may change over time so let those programs
-    tell the user what they need.
+    [pre-commit-ignore] Dont check the asn1 files they are imported verbatime
+    from standards documents in most cases.
     
-    Change-Id: I64d038564f6151d4a46d986e677f2cdc13ff87f2
-    Reviewed-on: https://code.wireshark.org/review/6028
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
+    Change-Id: Ie9db1a1431a201dc374f800b5118a199dcb51b9c
+    Reviewed-on: https://code.wireshark.org/review/16035
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit afbdf10
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Tue Dec 23 15:24:57 2014 -0700
+commit 88b7a48
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jun 19 23:54:33 2016 -0700
 
-    Change version info string "without locale" to "with default locale" so
-    it doesn't sound as though something is missing.
+    Pull the options structure initialization into commandline_other_options().
     
-    Change-Id: Ifa584357c4613fd898824db011329971c9561c41
-    Reviewed-on: https://code.wireshark.org/review/6027
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
+    Change-Id: I931cde27a81566dfa0ce6e5c9307bfc1a4d5fe54
+    Reviewed-on: https://code.wireshark.org/review/16033
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 7d87adf
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Tue Dec 23 13:42:35 2014 -0700
+commit 7795082
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sun Jun 19 17:53:59 2016 -0400
 
-    packet-reload needs conversation.h still
+    Add display filter completion suggestions to color filters.
     
-    Change-Id: I75415dfcfa1c63bd9c43b7bedab2ac3873a60326
-    Reviewed-on: https://code.wireshark.org/review/6024
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
+    Change-Id: I84d890b55c72e4427ceb2d64e4a7888c07c030f5
+    Reviewed-on: https://code.wireshark.org/review/16024
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 0b6adfc
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Dec 18 22:17:48 2014 +0100
+commit 5c1d58b
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sun Jun 19 17:47:27 2016 -0400
 
-    Add .mailmap: fix duplicate/wrong e-mail or name in commit log
-    
-    It will be reused form generate AUTHORS file
+    Add field completion suggestions when adding a Display filter or Y Field to the IO Graph
     
-    Change-Id: I43c388df34551b898f15913c2625b1996ace0cbc
-    Reviewed-on: https://code.wireshark.org/review/5841
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Lukas Emersberger <lukas.emersberger@gmail.com>
-    Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Bug: 11899
+    Change-Id: I7cee36581dc773daa691dad10500124ab66520bc
+    Reviewed-on: https://code.wireshark.org/review/16023
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 7e8a4b0
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Tue Dec 23 17:10:40 2014 +0000
+commit 66bb67c
+Author: Gerald Combs <gerald@zing.org>
+Date:   Sat Jun 18 12:13:15 2016 -0700
 
-    Deleting unnecessary #includes from dissectors.
-    Fourth batch (packet-mac-lte.c -> packet-rtp.c).
+    GTK+: Truncate simple_message_box messages.
     
-    Will look at cleaning up and committing script afterwards.
+    In do_simple_message_box, build our primary message using
+    g_string_vprintf instead of g_strdup_vprintf. Truncate both the primary
+    and secondary messages so that we end up with merely annoyingly wide
+    dialogs instead of insanely wide ones.
     
-    Change-Id: Id921f07f4b274f0cfb77ce81abe4a285fdb8b644
-    Reviewed-on: https://code.wireshark.org/review/6023
-    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Bug: 9761
+    Change-Id: I93ff76344c0da7d97cce5180ed9ecf9349190f6f
+    Reviewed-on: https://code.wireshark.org/review/16005
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 9d7709e
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Tue Dec 23 15:15:15 2014 +0000
+commit e3289a8
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Fri Jun 17 13:43:20 2016 -0700
 
-    Restore prefs.h for ipv6 too
+    qt: reset the column sorting when a new file is loaded
     
-    Change-Id: Ibdc7098532c1aff7ec6135b8e4460056049f9089
-    Reviewed-on: https://code.wireshark.org/review/6020
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Bug: 12541
+    Change-Id: I75656d4027dd39e1f97c4bcd38e0dea6fe2de297
+    Reviewed-on: https://code.wireshark.org/review/16002
+    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 78edcff
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Tue Dec 23 15:02:35 2014 +0000
+commit 92f4c7c
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sun Jun 19 16:52:50 2016 +0200
 
-    Adding back epan/prefs.h to try to fix build
+    Add JSON export to Qt/GTK UI
     
-    Change-Id: Ie532d81817653edfb20b7afefb28be21a627b239
-    Reviewed-on: https://code.wireshark.org/review/6019
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Change-Id: I5ff46a40cdb1f8f41565d2aa54c6f9e61d397e3a
+    Reviewed-on: https://code.wireshark.org/review/16013
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 86ed26f
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Tue Dec 23 14:37:44 2014 +0000
+commit bea1950
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jun 19 17:42:14 2016 -0700
 
-    Deleting unnecessary #includes from dissectors.
-    Third batch (packet-icmpv6.c -> packet-mac-lte.c).
+    Protect some code that's only for Wireshark-with-pcap.
     
-    Will look at cleaning up and committing script afterwards.
-    
-    Change-Id: Ib91e36ad200db01c3000605f6a7a21125b96a640
-    Reviewed-on: https://code.wireshark.org/review/6018
-    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-
-commit 377555e
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Dec 23 11:25:10 2014 +0100
-
-    [column utils] fix warning: unknown command tag name [-Wdocumentation-unknown-command]
+    Put that code inside #ifdef HAVE_LIBPCAP/#endif.
     
-    Change-Id: I5a14875b4b61ae7635095bdf9f2ab18dd9dbfc09
-    Reviewed-on: https://code.wireshark.org/review/6012
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I85768fd49a008341a95ac3c8656e96afa6741fbe
+    Reviewed-on: https://code.wireshark.org/review/16030
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit c670adc
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Dec 22 20:52:47 2014 +0100
+commit e79e834
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jun 19 16:36:57 2016 -0700
 
-    DOCSIS: missing break in switch (CID 280485 & 280486)
+    Move some option checking to common code.
     
-    Change-Id: I5b756b96ca6c3c48a43948d456bfcb07aab527fd
-    Reviewed-on: https://code.wireshark.org/review/5994
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: Icff9dacd73ea933c59ed664db05098dd8cb3dbf5
+    Reviewed-on: https://code.wireshark.org/review/16029
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 91cc343
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Dec 22 22:49:08 2014 +0100
+commit fb9a7d4
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jun 19 15:28:39 2016 -0700
 
-    Qt (emitAppSignal): Missing break in switch (CID 1159204)
+    Don't assume we successfully read the configuration files.
     
-    Change-Id: Ia2ba40a4fc284dbf3da8e27edf336a4e27cdb4e3
-    Reviewed-on: https://code.wireshark.org/review/6000
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 35949f3
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Tue Dec 23 12:56:29 2014 +0000
-
-    Restore stdlib.h (should not have been deleted - mispelt in script)
+    read_configuration_files() can fail and return NULL, so check that
+    commandline_info.prefs_p is non-null before dereferencing it.
     
-    Change-Id: I43387489ed29beff5a523e78cabcfb9e3ea8a182
-    Reviewed-on: https://code.wireshark.org/review/6015
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-
-commit 28e24ad
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Tue Dec 23 12:37:32 2014 +0000
-
-    epan/llcsaps.h was needed, so restore include
+    Fixes CID 1362778.
     
-    Change-Id: I443db244bde04af9397bcb5bfa3a1888b0560bf0
-    Reviewed-on: https://code.wireshark.org/review/6014
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Change-Id: I3066769c474d394fbfe548b50d6be704964e59d3
+    Reviewed-on: https://code.wireshark.org/review/16028
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 48db254
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Tue Dec 23 11:34:43 2014 +0000
+commit 30919f7
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jun 19 15:18:00 2016 -0700
 
-    Deleting unneccessary #includes from dissectors.
-    Second batch (packet-eth.c -> packet-icmpv6.d).
+    Don't assume we have an array of GeoIP databases.
     
-    Will look at cleaning up and committing script afterwards.
+    The attempt to open them might fail; if geoip_dat_arr is null, just
+    return 0 as the number of databases, don't crash.
     
-    Change-Id: I14295758b81a59115d8c88899f166cc3d5d17594
-    Reviewed-on: https://code.wireshark.org/review/6013
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Change-Id: I967d863d328a42d7dce79f58d4fa67d922d0cb2c
+    Reviewed-on: https://code.wireshark.org/review/16025
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 0e78f7e
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Dec 22 19:44:29 2014 +0100
+commit 234d8ea
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jun 19 14:12:30 2016 -0700
 
-    RTPS: Missing break in switch (CID 996922)
+    Pass the info strings directly to commandline_early_options().
     
-    Change-Id: I2b8a12d54414a1b2d878285b8c840de9586fcb5e
-    Reviewed-on: https://code.wireshark.org/review/5992
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b87b3db
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Dec 22 19:42:39 2014 +0100
-
-    NetScaler Trace: Missing break in switch (CID 281457, 727776 & 1021060)
+    Just pass them directly as arguments, don't stuff them into a structure.
     
-    Change-Id: I575114ba364da1b1d63eea8fc7b48c8c0e0bc99d
-    Reviewed-on: https://code.wireshark.org/review/5991
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: Iac84226f54898bc953011bca64795e9049762905
+    Reviewed-on: https://code.wireshark.org/review/16022
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 216cc12
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Dec 22 19:20:15 2014 +0100
+commit 85c805d
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jun 19 13:21:17 2016 -0700
 
-    NASDAQ ITCH: Missing break in switch (CID 280465)
+    Handle capture options in pcap-less Wireshark in the commandline_ routines.
     
-    Change-Id: I0f3ef7a39d9659b14ff472d2d3e59565db43ec3e
-    Reviewed-on: https://code.wireshark.org/review/5990
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Get rid of the capture_option_specified and arg_error members of the
+    commandline_capture_param_info_t and commandline_param_info_t
+    structures, and have them be local variables in
+    commandline_early_options() and commandline_other_options().  Have
+    commandline_early_options() print the "sorry, Wireshark wasn't built
+    with pcap" and exit if -D was specified but Wireshark wasn't built with
+    pcap.
+    
+    Change-Id: I0efcdea89d9585af8f3c0a28aee060f33d3ec5fd
+    Reviewed-on: https://code.wireshark.org/review/16021
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 4df2306
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Dec 22 19:16:52 2014 +0100
+commit 0ca9fc1
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jun 19 13:00:13 2016 -0700
 
-    ISNS: Missing break in switch (CID 280460)
+    Fix indentation.
     
-    Change-Id: Iaaa56e17e49cd42e18e55e316c691a22bbbdf8f1
-    Reviewed-on: https://code.wireshark.org/review/5989
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I71332dc35047e7d8d32b428fb99b8b9368c41de6
+    Reviewed-on: https://code.wireshark.org/review/16020
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit f103865
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Dec 21 16:15:10 2014 +0100
+commit 42985f4
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jun 19 12:55:48 2016 -0700
 
-    RSVP: RECORD_ROUTE IPv4 Subobject Flags field incorrect decoding
+    Those aren't capture options, they're the options we must process early.
     
-    The Flags field within RSVP RECORD_ROUTE IPv4_Subobject is decoded incorrectly.
-    Wireshark thinks that 0x10 bit represents Node-ID, but actually the Node-ID is encoded by bit 0x20 (per RFC 4561)
+    The only one of those options that has anything to do with packet
+    capture is -i, and all we do there is check for an argument of "-"; the
+    rest are either
     
-    Issue reported by  Alexander Okonnikov
+       1) options that affect your preference settings (-C to select
+          the profile, -P to set the personal file directory path);
     
-    Bug:10799
-    Change-Id: I48f6aa35c08945aacf8f2bb871a72b5927511948
-    Reviewed-on: https://code.wireshark.org/review/5944
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit f1562e2
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Dec 19 12:11:53 2014 +0100
-
-    NDPS: Missing break in switch (CID 281286)
+       2) options that just print something to the standard output or
+          error and exit, before firing up the GUI;
     
-    Change-Id: I2363370249d7beb2ed8a29987ac2cb602979d0a3
-    Reviewed-on: https://code.wireshark.org/review/5988
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+       3) extension command line options (-X).
+    
+    Change-Id: Iba9b8b14fe468e2ca9d4c67e1a9b8103603678d9
+    Reviewed-on: https://code.wireshark.org/review/16019
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit cd55821
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Dec 22 16:29:01 2014 +0100
+commit 147b3d5
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sun Jun 19 02:33:13 2016 -0400
 
-    test suite: fix indent (use tabs) and add modelines
+    Ability to invoke "Decode As..." as command-line argument for GUIshark.
     
-    Change-Id: I648d02d41f92c7fd176ce194eee20a2d19643fe0
-    Reviewed-on: https://code.wireshark.org/review/5985
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    TShark has had the functionality for awhile. While the GUI version
+    still has ways to change and persist Decode As functionality, adding
+    command line functionality gives the Decode As from initial launch
+    of the GUI.
+    Was also an excuse to refactor a bunch of code out of tshark.c
+    
+    Bug: 5143
+    Change-Id: Ie67007d75e897bc06cc9afd9b84372a96b93778c
+    Reviewed-on: https://code.wireshark.org/review/16008
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit c3d7080
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Dec 22 16:28:19 2014 +0100
+commit f4fc03d
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jun 19 09:52:55 2016 -0700
 
-    Makefile (epan/dissectors): fix indent (use tabs)
+    Get rid of an unused variable.
     
-    Change-Id: I72d2dbc05f7cfbd7adf05ed66be81946942cef3b
-    Reviewed-on: https://code.wireshark.org/review/5984
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    There's no need for the capture_option_specified variable; it's now in a
+    structure.
+    
+    Change-Id: Ic2f1faee4666eea7ae91fd6899cecaa76d0ceb9f
+    Reviewed-on: https://code.wireshark.org/review/16018
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 7208591
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Dec 22 16:27:14 2014 +0100
+commit 6febf9b
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jun 19 09:29:21 2016 -0700
 
-    CMake (epan/CMakeList.txt): fix indent (use tabs)
+    Get rid of an unused variable; set a structure member.
     
-    Change-Id: I40e05f1e4430eadc480134cd62dd01f978353b67
-    Reviewed-on: https://code.wireshark.org/review/5983
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    There's no need for the capture_option_specified variable, but we *do*
+    need to initialize the capture_option_specified member of *param_info
+    before parsing the flags.
+    
+    Change-Id: I89d0b8c338c2784742b21ba4e854f702ce491849
+    Reviewed-on: https://code.wireshark.org/review/16017
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit b5ff13a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Dec 22 16:24:24 2014 +0100
+commit bb44b48
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Jun 19 08:10:58 2016 -0700
 
-    UseLemon (CMake): Fix indent (use space)
+    [Automatic update for 2016-06-19]
     
-    Change-Id: I619d64d62d2fb96ab904d5ea15e3c37aa0319540
-    Reviewed-on: https://code.wireshark.org/review/5982
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Update manuf, services enterprise-numbers, translations, and other items.
+    
+    Change-Id: Idd2d53a32188f2e607351da874b1a68a4811ed57
+    Reviewed-on: https://code.wireshark.org/review/16014
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 3d05935
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Dec 23 01:01:13 2014 -0500
+commit a383e69
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sun Jun 19 11:01:56 2016 +0200
 
-    kerberos: Re-add needed #include <stdio.h>
+    Revert "tap: change glib functions to wmem."
+    
+    This reverts commit 2e9f3c5d366eaa7139fc877b5301392166b3f985.
+    
+    It breaks the registration of codec, dissector and libwiretap plugins.
     
-    Change-Id: I85c0e5f022b5c04df6079e118e376e8d598675aa
-    Reviewed-on: https://code.wireshark.org/review/6011
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: I4ef91dd192f765adf87ea9fe9f3693e25dbd24de
+    Reviewed-on: https://code.wireshark.org/review/16012
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit dd859ea
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Dec 23 00:32:58 2014 -0500
+commit ff84512
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Sun Jun 19 10:33:59 2016 +0200
 
-    asn1 generated dissectors: cleanup #include usage
+    Add modelines
     
-    Change-Id: I36b2731d67f9345d2fd0c23800bba7d2be94c387
-    Reviewed-on: https://code.wireshark.org/review/6008
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: I3d5ed2e671ec761f3628fb8de6f393fdc915165e
+    Reviewed-on: https://code.wireshark.org/review/16011
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 
-commit 17582d3
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Dec 23 00:27:27 2014 -0500
+commit 51ceb6d
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Fri Jun 17 20:28:58 2016 +0200
 
-    asn1/Makefile.nmake: packet-c1222.c not autogenerated using Windows nmake
+    Calculate and print CWmin and CWmax in addition to ECWmin and ECWmax
+    
+    This also changes the summary presentation to make it more compact
     
-    Change-Id: I21628bdd1a08348629350a373f1c20e02c3618f7
-    Reviewed-on: https://code.wireshark.org/review/6007
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: I27ef8b2da280e36cff84dcb97d6d40dc0015a74b
+    Reviewed-on: https://code.wireshark.org/review/16000
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 
-commit 1b37f4c
+commit f4fd1a3
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Dec 22 21:03:46 2014 -0800
+Date:   Sun Jun 19 00:49:42 2016 -0700
 
-    Cmake: check for popcount, and build it from wsutil/popcount.c if missing.
+    Fix problems when compiling without pcap.
     
-    Change-Id: Id646a9f0b1fc6acafa99a78725e3f0ec8a48c170
-    Reviewed-on: https://code.wireshark.org/review/6006
+    Change-Id: Id682a76ac561f92f65638bbdfcd4236eb92e46b7
+    Reviewed-on: https://code.wireshark.org/review/16010
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 4009231
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Mon Dec 22 17:44:20 2014 -0700
+commit 8634cee
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jun 19 00:38:41 2016 -0700
 
-    Try to fix Windows build for popcount() unresolved external symbol
+    Put #ifdef/#endif around a variable used only on Windows.
     
-    Change-Id: Ie154caa1967ce4016dd52eefcf757e2e58d7ac68
-    Reviewed-on: https://code.wireshark.org/review/6005
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
+    Change-Id: Ia6fed6db03cb88433469e758693fcc72c4bd9071
+    Reviewed-on: https://code.wireshark.org/review/16009
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit ae6df38
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Mon Dec 22 17:18:20 2014 -0700
+commit 9b5b444
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sat Jun 18 16:49:23 2016 -0400
 
-    packet-dtls.c still needs conversation.h
+    Refactor command-line handling of GUI options.
     
-    Change-Id: I1e6a55c41cbab74790880da2b3691cd7d82bc276
-    Reviewed-on: https://code.wireshark.org/review/6004
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
-
-commit 3d62d2c
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Mon Dec 22 13:50:10 2014 -0700
-
-    Move popcount() to an optionally built part of wsutil for systems that
-    provide their own popcount().
+    Both GTK and Qt both use the same command-line options, so refactor
+    the parsing and (possibly) applying of those arguments to a single
+    location.
     
-    Change-Id: Ic26f3b50cf0bd2b4af0d42e9c27488ebbac1ab33
-    Reviewed-on: https://code.wireshark.org/review/5998
-    Petri-Dish: Stephen Fisher <sfisher@sdf.org>
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
+    Ping-Bug: 12546
+    Change-Id: Ib31e576c509c5d3d21c33d3247640d9f9c68661b
+    Reviewed-on: https://code.wireshark.org/review/16006
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 59b4ab5
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Dec 22 13:51:34 2014 -0800
+commit deef1dc
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Thu Jun 16 14:58:19 2016 -0700
 
-    Include <math.h> or <stdlib.h> as necessary to declare functions.
+    cmake: add PIDL dissector generation support
     
-    Various floating-point math functions require <math.h>, and abs()
-    requires <stdlib.h>.
+    The dissectors list is generated based on regex magic on pidl/Makefile.
+    A dssetup.cnf file is added because all other protocols already have
+    this file. The srvsvc and wkssvc protocols cannot be built for some
+    reason, so just disable it (this mirrors the original Makefile).
     
-    Change-Id: I6831cfdb17eac3ce129b6800f0fe82fbcfef2d28
-    Reviewed-on: https://code.wireshark.org/review/6002
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit d541774
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Dec 22 13:23:51 2014 -0800
-
-    Include <math.h> or <stdlib.h> as necessary to declare functions.
+    Add frsrpc and samr to PIDL_DISSECTOR_SRC list which was missing
+    compared to autotools.
     
-    Various floating-point math functions require <math.h>, and abs()
-    requires <stdlib.h>.
+    Tested with an out-of-tree and in-tree build with cmake (make and ninja):
     
-    Change-Id: Iadba9e0d7168bba6e67d9221e757a85960507742
-    Reviewed-on: https://code.wireshark.org/review/5999
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+        cmake -GNinja && ninja -v pidl-dissectors
+        touch epan/dissectors/pidl/dfs/dfs.idl && ninja generate_dissector-dcerpc-dfs
+        cmake . && make -C epan/dissectors/pidl generate_dissector-dcerpc-dfs
+    
+    Change-Id: Id8bf34e76c20053a8a393024560d90a048473e03
+    Reviewed-on: https://code.wireshark.org/review/15962
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 596669f
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Mon Dec 22 19:57:31 2014 +0000
+commit c07fd44
+Author: Binh Trinh <beango@gmail.com>
+Date:   Fri Jun 17 21:46:11 2016 -0400
 
-    First batch of unincludes. Last attempt...
+    DCE/RPC: fix array of pointers with NULL
     
-    Change-Id: I3681462aeb98ca62ed3ec5eb226b2553317391a9
-    Reviewed-on: https://code.wireshark.org/review/5997
-    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Change-Id: Ie89f8fd4ec744d427d41866206d5a6784c5b224f
+    Reviewed-on: https://code.wireshark.org/review/16004
+    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit b018128
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Mon Dec 22 11:06:05 2014 -0700
+commit a7aaf0b
+Author: Chris Brandson <chris.brandson@gmail.com>
+Date:   Fri Jun 17 11:38:15 2016 -0700
 
-    Cast a parameter in the kerberos dissector so it compiles without
-    warnings on NetBSD.
+    ZigBee dissector added support for the Power Negotiation bit
+    
+    An update to R22 adds the Power Negotiation bit to the Parent
+    Information of the End Device Timeout Response
     
-    Change-Id: Id1ab5020fa53656065b0b2438071342eae4f7adb
-    Reviewed-on: https://code.wireshark.org/review/5987
-    Petri-Dish: Stephen Fisher <sfisher@sdf.org>
+    Change-Id: I3d423e1088821ccaba98183e2be7f2152bd659d1
+    Reviewed-on: https://code.wireshark.org/review/16001
+    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: Stephen Fisher <sfisher@sdf.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 5cdad9f
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sun Dec 21 13:23:02 2014 -0800
+commit 631b9c4
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Fri Jun 17 10:58:32 2016 -0400
 
-    Qt: Add methods to CaptureFile and WiresharkApplication.
+    GTPv2: Use proto_tree_add_bitmask
     
-    Add isValid, fileTitle, and retapPackets methods to CaptureFile. Add
-    application name and title separator convenience methods to
-    WiresharkApplication.
+    Change-Id: I236a3513237a7a977389438adaf381542281943d
+    Reviewed-on: https://code.wireshark.org/review/15997
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit 2dc3e52
+Author: Samiran Saha <ssahasamiran@gmail.com>
+Date:   Fri Jun 17 18:20:04 2016 +0530
+
+    MKA: tvbrange for all subtrees corrected
     
-    Convert traffic tables, conversations, and endpoints to use CaptureFile
-    directly and to let the user know when the capture file is closed. Set
-    the file dialog titles while we're here.
+    * Incorrect tvbrabge was affecting highlight on selection.
     
-    Change-Id: I990392786d3833e1e0b3638aa2d34a5ada39fa13
-    Reviewed-on: https://code.wireshark.org/review/5957
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    * AN & Confidentiality Offset dissection fixed.
+    
+    Change-Id: Ibc4422322b765b0073471345f6e0bc3b1aeba2f9
+    Reviewed-on: https://code.wireshark.org/review/15996
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 30c3d39
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Dec 22 10:49:21 2014 +0000
+commit 5a85add
+Author: Kenny Root <kenny@the-b.org>
+Date:   Thu Jun 16 00:12:53 2016 -0700
 
-    Revert "Move packet-kerberos.c to the dirty dissectors because it generates warnings (at least on NetBSD), presumably due to our use of -Wc++-compat:"
+    ssh: add RSA host key printing
     
-    This reverts commit d4ff430b4dc5cf0e3efaabd2ef53778070def558.
+    Adds a dissector for the ssh-rsa type of public key where the modulus
+    and public exponent are extracted out.
     
-    Change-Id: Icb0907e649555237b4a86f9f651ec4df8d79d99b
-    Reviewed-on: https://code.wireshark.org/review/5975
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
+    Change-Id: I10b1f2d6f41878d9f7ffe5d399b9b7d4f69ad96e
+    Reviewed-on: https://code.wireshark.org/review/15975
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 352bd87
-Author: Sergey Avseyev <sergey.avseyev@gmail.com>
-Date:   Mon Dec 22 17:34:05 2014 +0300
+commit e600526
+Author: Kenny Root <kenny@the-b.org>
+Date:   Wed Jun 15 17:05:54 2016 -0700
 
-    packet-couchbase.c: remove field which does not exists
+    ssh: add hostkey information
     
-    Change-Id: Ia4a2a6127edbb6a92becf22cd6ee689e5e2a7966
-    Reviewed-on: https://code.wireshark.org/review/5981
-    Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Adds a framework for hostkey to be printed out separately from the rest
+    of the key exchange. This will allow for individual key information to
+    be presented separately in subsequent changes.
+    
+    Change-Id: I27433772ef1a9e1c45f388809017ed07cf6e41fa
+    Reviewed-on: https://code.wireshark.org/review/15974
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 5248c0d
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Dec 22 12:13:34 2014 +0100
+commit ecd4120
+Author: Binh Trinh <beango@gmail.com>
+Date:   Thu Jun 16 23:51:14 2016 -0400
 
-    Fix unknown command tag name [-Wdocumentation-unknown-command]
+    Diameter-3GPP: add AVP 21 RAT-Type decoding
     
-    Change-Id: I6c2564a86e13d9321001856ba1f51681a9f20976
-    Reviewed-on: https://code.wireshark.org/review/5979
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: Ibede796a52bb382525bc1f430d5fdecd555c233f
+    Reviewed-on: https://code.wireshark.org/review/15993
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit ed2df3b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Dec 22 11:42:58 2014 +0100
+commit e912db4
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Fri Jun 17 17:45:28 2016 +0200
 
-    fix warning: parameter 'list' not found in the function declaration [-Wdocumentation]
+    Add an expert item to asure that aifsn is at least 2
     
-    Change-Id: Id6d02f5c1383dd8f231707f519ec1b28fb007079
-    Reviewed-on: https://code.wireshark.org/review/5978
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: If7105ba2e476acca8a02ce740decc4966b0af1bb
+    Reviewed-on: https://code.wireshark.org/review/15998
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 
-commit f8720a6
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Dec 22 12:06:36 2014 +0100
+commit 2e9f3c5
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue May 3 18:40:17 2016 +0200
 
-    ANSI MAP: Remove from Dirty ASN1 list
+    tap: change glib functions to wmem.
     
-    Change-Id: I192c447919ee9c3f430f058c2e5285501af962bf
-    Reviewed-on: https://code.wireshark.org/review/5977
+    Change-Id: I878ae6b121a669f9b7f4e1e57bc079f0cb44c0bf
+    Reviewed-on: https://code.wireshark.org/review/15270
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Evan Huus <eapache@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 414701d
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Dec 22 11:45:05 2014 +0100
+commit 2aa55a3
+Author: Binh Trinh <beango@gmail.com>
+Date:   Fri Jun 17 01:21:19 2016 -0400
 
-    ANSI_MAP: Fix unused function (by add to .OMIT list)
+    GTPV2: add decoding of ECI into enodebid and cellid
     
-    Change-Id: I4e2278d563659db6acc6c02b9e66d58c67939e30
-    warning: unused function 'dissect_ansi_map_InvokeData' [-Wunused-function]
-    warning: unused function 'dissect_ansi_map_ReturnData' [-Wunused-function]
-    Reviewed-on: https://code.wireshark.org/review/5976
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: If46cc354e202ff9a126580bf742d747e42678f83
+    Reviewed-on: https://code.wireshark.org/review/15994
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 3cb816c
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Dec 22 11:32:27 2014 +0100
+commit a6da022
+Author: Jens Kilian <jens.kilian@advantest.com>
+Date:   Fri Jun 17 12:39:09 2016 +0200
 
-    PTP: Fix ptp_tree may be used uninitialized in this function [-Werror=maybe-uninitialized]
+    Qt: Fix a compile error occurring on RedHat Enterprise Linux.
     
-    Change-Id: I0b82782deb568256dafd4c1bf163fd3e74f95545
-    Reviewed-on: https://code.wireshark.org/review/5974
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Another missing Qt #include; probably caused by commit 157721c.
+    
+    Change-Id: I8ab4be9f18dffde7159debd842201e2a67230ec8
+    Reviewed-on: https://code.wireshark.org/review/15995
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
 
-commit 67cbafa
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Dec 21 18:15:36 2014 +0100
+commit a4f5802
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Jun 15 00:04:21 2016 +0200
 
-    remove unnecessary integer overflow checks
-    
-    ... and don't call THROW() from a dissector
+    autotool: Add -Wc99-extensions CFLAGS
     
-    If we have a guint32 a and interpret 2*a as gint, we'll always end up
-    with a negative value if 2*a overflows. Both tvb_get_string_enc() and
-    proto_tree_add_item() handle this case and throw an exception.
+    See with CMake (ga9070e1a90)
     
-    Change-Id: Ibb142328837b6a583057531c76d08631fc731848
-    Reviewed-on: https://code.wireshark.org/review/5948
+    Change-Id: If768b663f9ed032503fc121785b078c0107cdadc
+    Reviewed-on: https://code.wireshark.org/review/15909
     Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
 
-commit 9b3f9b7
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Dec 21 20:15:47 2014 +0100
+commit 42b0609
+Author: Martin Kacer <kacer.martin@gmail.com>
+Date:   Mon Jun 13 15:47:44 2016 +0200
 
-    Fix The left operand of '!=' is a garbage value issue found by Clang Analyzer
+    tshark JSON and Elasticsearch output
     
-    Change-Id: Ia555fc8eca2a7288c159983578cbc88dc0bebbc2
-    Reviewed-on: https://code.wireshark.org/review/5952
+    Added ouput -T for json|ek
+    Added -j switch fo filter EK json|ek fields.
+    Added -x switch to work with json|ek to insert raw fields.
+    
+    Bug: 11754
+    
+    Change-Id: Iad5a9092b843c074b0b774d1745fa14fca09f6b7
+    Reviewed-on: https://code.wireshark.org/review/15869
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
+    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 37940ee
-Author: Doug Brown <doug@downtowndougbrown.com>
-Date:   Sun Dec 21 19:30:46 2014 -0800
+commit 0aa5f6c
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Thu Jun 16 15:23:59 2016 -0700
 
-    Fix AARP AppleTalk address parsing
+    idl2wrs: fix more bad strndups
     
-    AppleTalk addresses are 3 bytes long and stored in AARP packets as 4 bytes.
-    The high byte should be 0, followed by 2-byte network number, followed by
-    1-byte node number.
+    Fixed another g_strndup case that truncated the name and replaced more
+    by strdups when possible.
     
-    The previous code was assuming that the high two bytes were the network number,
-    followed by the 1-byte node number, followed by 0.
-    
-    Change-Id: I467ec6edac353796db0b96fbac65658d5c5491d3
-    Reviewed-on: https://code.wireshark.org/review/5968
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Id7ce4d82da9fb1d0071bc7a6b4e7c2062bf77f55
+    Reviewed-on: https://code.wireshark.org/review/15988
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 7b721a1
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Dec 21 22:42:28 2014 -0800
+commit 22fb7a5
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Thu Jun 16 23:26:58 2016 +0100
 
-    Squelch a compiler warning.
+    mswsp: Remove null check (CID1355407)
     
-    ("Can't happen", but that requires more dataflow analysis than some
-    compilers do.)
+    value->type is already asserted as not null (and probably shouldn't be).
     
-    Change-Id: I5c6acbff64ea88f9b43d5580522bc144465dc9ac
-    Reviewed-on: https://code.wireshark.org/review/5972
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I574d3e7e0d5c636e6b731c1c817f2e457447afc1
+    Reviewed-on: https://code.wireshark.org/review/15990
+    Petri-Dish: João Valverde <j@v6e.pt>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 998a847
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Sun Dec 21 23:54:35 2014 -0500
+commit 0ca6a6d
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Wed Jun 15 02:20:11 2016 +0100
 
-    plugins: Cleanup #includes
+    Align AUTHORS.src column
     
-    Change-Id: Ic839f2995532d68308f8b5908c185acc7acaaa9c
-    Mostly: remove '#include <glib/glib.h>' and certain
-             other #includes already included in packet.h
-    Reviewed-on: https://code.wireshark.org/review/5971
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: I17ed5e0be356666e9b29490ce43deb357fe177ff
+    Reviewed-on: https://code.wireshark.org/review/15991
+    Reviewed-by: João Valverde <j@v6e.pt>
 
-commit 971d4e4
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Sun Dec 21 23:52:47 2014 -0500
+commit f9c2a2e
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Thu Jun 16 10:38:33 2016 +0100
 
-    stats_tree: g_sprintf()-->g_snprintf(); cleanup #includes.
+    LDSS: Add an assertion (CID280539,CID280540)
     
-    Change-Id: I862fed818cd1f14584b082f87b1d4d305cf78687
-    Reviewed-on: https://code.wireshark.org/review/5970
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: I18082a4d45f0c320b8ee0e11139295eb1aee2c89
+    Reviewed-on: https://code.wireshark.org/review/15968
+    Petri-Dish: João Valverde <j@v6e.pt>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: João Valverde <j@v6e.pt>
 
-commit 94eeaf1
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Sun Dec 21 23:50:49 2014 -0500
+commit 157721c
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Jun 16 14:09:28 2016 -0700
 
-    print.c: clean up #includes
+    Qt: Add "Copy As…" to VoIP Calls.
     
-    Change-Id: I0ecf618cc79060d35b5480f3d8e7ebf8575761c4
-    Reviewed-on: https://code.wireshark.org/review/5969
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Bug: 4389
+    Change-Id: I88dba82bd63e8c3be2b6fac3eca88f810c62d8bd
+    Reviewed-on: https://code.wireshark.org/review/15985
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 4cb19d4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Dec 21 19:33:10 2014 -0800
+commit ee6e89d
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Thu Jun 16 10:18:07 2016 +0100
 
-    Use the messageLength field to indicate the message length.
+    CANopen: Check array bounds for untrusted index (CID 1356262)
     
-    Check it for sanity (and report errors), and use it to set the length of
-    the PTP packet tvbuff and the PTP top-level protocol item.
+    Change-Id: If5ca51e5703fa4137ab9f388a99d613752d3b0d0
+    Reviewed-on: https://code.wireshark.org/review/15983
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: João Valverde <j@v6e.pt>
+
+commit 99e2466
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Jun 16 13:31:47 2016 -0700
+
+    Add a sequence analysis wishlist item.
     
-    Bug: 10611
-    Change-Id: I9af6aad5f07d405ebb14885dc986a73e430d7bdb
-    Reviewed-on: https://code.wireshark.org/review/5967
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Idea0bab80c7c05e3ad9f8591904e882df69a17ff
+    Reviewed-on: https://code.wireshark.org/review/15984
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 859360a
-Author: Ebben Aries <exa@fb.com>
-Date:   Sun Dec 21 19:27:58 2014 -0700
+commit c269684
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Thu Jun 16 10:20:40 2016 -0700
 
-    BGP : Update BGP-LS Attribute + Display NEXT_HOP
+    lemon: use a define for fseek()'s whence parameter
     
-    From IANA page: http://www.iana.org/assignments/bgp-parameters/bgp-parameters.xhtml
+    for people who don't immediately understand what fseek(fp, 0, 2) does
     
-    Change-Id: Ibc85dccee94aa69306c88b48d680e48fede08f2e
-    Reviewed-on: https://code.wireshark.org/review/5965
+    Change-Id: I297ba6fd718ef0f09c4d0b29bf433262c3c38435
+    Reviewed-on: https://code.wireshark.org/review/15976
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit a5a2565
-Author: sfd <stephen.donnelly@emulex.com>
-Date:   Mon Dec 22 14:29:41 2014 +1300
+commit 0600f92
+Author: Victor Barratault <victor.barratault@gmail.com>
+Date:   Thu Jun 16 14:06:32 2016 -0400
 
-    Removing ptp.v2.an.fcs as this erroneously refers to the Ethernet FCS which is properly handled by the Ethernet dissector.
+    ldap: added modify-increment operation identification in packet dissection and generate the modified dissector dissector
     
-    Bug: 10611
-    Change-Id: I735085edf5c0d2a66c30c940c4b780a2ce8db6d4
-    Reviewed-on: https://code.wireshark.org/review/5964
+    Change-Id: Iad745b9e0e8ab0bc055da7f26ec0822433897db7
+    Reviewed-on: https://code.wireshark.org/review/15977
     Reviewed-by: Michael Mann <mmann78@netscape.net>
     Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 8076f29
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Dec 21 16:41:49 2014 -0800
+commit 86a7ab1
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Thu Jun 16 20:51:24 2016 +0200
 
-    Qt: Fix status bar signal.
+    DEC DNART: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
     
-    Change-Id: Ie935269f6cbe9495b95bcc24b45198fbd284fb35
-    Reviewed-on: https://code.wireshark.org/review/5963
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Ic2d333b418928351f32673890c9c432c7bfa0f16
+    Reviewed-on: https://code.wireshark.org/review/15982
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 8228bcf
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Dec 21 16:15:42 2014 -0800
+commit c1626db
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Thu Jun 16 20:48:58 2016 +0200
 
-    Wrong array.
+    SITA: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
     
-    Change-Id: I69ceca8be624b13f910997dee3bc6852b61b0162
-    Reviewed-on: https://code.wireshark.org/review/5962
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I2565b0bee66f934561df506e87a35fdd14590f92
+    Reviewed-on: https://code.wireshark.org/review/15981
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 147ca45
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Dec 21 16:09:15 2014 -0800
+commit 13c0136
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Wed Jun 15 18:54:07 2016 -0400
 
-    Improve the message for "this field has an integral type" assertions.
+    DCE/RPC proto_tree_add_boolean -> proto_tree_add_bitmask_value
     
-    (Along the lines of provious changes.)
-    
-    Change-Id: I22d76f22400d4a93242392ff4688acc753eb0039
-    Reviewed-on: https://code.wireshark.org/review/5961
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I88398aa1923e86bb83b97cc3904529a5810f6c40
+    Reviewed-on: https://code.wireshark.org/review/15978
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit c30aa11
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Dec 21 15:35:14 2014 -0800
+commit c98b0d5
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Tue Jun 14 23:59:12 2016 +0200
 
-    Register the ORFEntry IP address as an IPv4 address.
+    Add Cisco ttag dissector
     
-    We're adding it with proto_tree_add_ipv4(), so that it's displayed as,
-    and can be tested as, an IPv4 address.  That means that the field for it
-    must be of type FT_IPv4, *even though it's calculated from an 8-bit
-    prefix value* - you can't make it an FT_UINT8.
+    Add dissector for Cisco ttag protocol.
     
-    Change-Id: I7d668fb2a707cdda4ad228afcbdcaf47ee6cba1b
-    Reviewed-on: https://code.wireshark.org/review/5960
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Bug: 12518
+    Change-Id: Id17293a80b2b6827fd2d5c7ead098784c35a28ef
+    Reviewed-on: https://code.wireshark.org/review/15964
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
 
-commit 48419fc
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Dec 21 15:17:13 2014 -0800
+commit 0e8fef5
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Thu Jun 16 12:43:24 2016 -0400
 
-    Improve the message for "this field doesn't have the right type" assertions.
+    Finish getting making the Diameter XML valid XML.
     
-    Give the field name in the message.
+    ... Except for the fact that many AVP names start with "3GPP".
     
-    Change-Id: I046c74b451b473c9c87c2980122b025390f82cc8
-    Reviewed-on: https://code.wireshark.org/review/5959
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 0be413e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Dec 21 14:09:28 2014 -0800
-
-    Move another helper macro.
+    Make the AVP names XML IDs again.
     
-    Change-Id: Id3801373526af57146a87abe9698b192074a0fa0
-    Reviewed-on: https://code.wireshark.org/review/5958
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Fix all the grouped AVPs that reference AVPs (by name) or vice-versa.  This
+    includes:
+     * Fixing a bunch of typos (including type mismatches).
+     * Commenting out a number of references to vendor AVPs for which we don't have
+       the specs.
+     * Adding a few missing AVPs.
+    
+    Change-Id: Ic2ddb50cc947877de9086be51f7813e8f9be02b4
+    Reviewed-on: https://code.wireshark.org/review/15973
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 5d30a3c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Dec 21 13:44:46 2014 -0800
+commit 4ad428d
+Author: Kenny Root <kenny@the-b.org>
+Date:   Wed Jun 15 23:53:49 2016 -0700
 
-    Define helper macros before they're used.
+    ssh: set packet lengths correctly
     
-    The code works if they're defined afterwards, but defining them earlier
-    makes it a bit clearer that they're helper macros used as components of
-    the macros we're exporting.
+    Each SSH packet was being set to be the remaining length of the frame.
+    This change sets the packet lengths correctly for each SSH packet.
     
-    Change-Id: I326894eea67d2db43fedf4567699cd9eaaa0e004
-    Reviewed-on: https://code.wireshark.org/review/5956
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Id9c2331d875465cd5e6bb788d420e0025f5d496e
+    Reviewed-on: https://code.wireshark.org/review/15966
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit c96858b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Dec 21 13:05:46 2014 -0800
+commit b22e1ae
+Author: Kenny Root <kenny@the-b.org>
+Date:   Wed Jun 15 23:54:43 2016 -0700
 
-    Use the "netbios" heuristic dissector list elsewhere.
+    ssh: packets after SSH_MSG_NEWKEYS are encrypted
     
-    Use find_heur_dissector_list() to find the "netbios" heuristic dissector
-    list, rather than using code from packet-netbios.c.
+    According to RFC 4253 section 7.3, once the SSH_MSG_NEWKEYS is received
+    all packets after that will be encrypted using the negotiated keys. This
+    can happen in the middle of a frame, so account for the offset in the
+    frame where this happens.
     
-    Change-Id: Ieeab58d7c6eb32491b026b242c687bd18c4d5cdb
-    Reviewed-on: https://code.wireshark.org/review/5955
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ibc3b06a4bdfe38ae15b0e65afac6f5d3646cb58d
+    Reviewed-on: https://code.wireshark.org/review/15965
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 9407160
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Dec 21 20:56:33 2014 +0100
+commit 9a5e6a6
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Wed Jun 15 15:35:51 2016 -0400
 
-    Do not use packet scoped memory in GUI
+    DCE/RPC proto_tree_add_boolean -> proto_tree_add_bitmask_with_flags
     
-    It will trigger an assertion
-    
-    Change-Id: I2436c11b45e1505a94256a06ed3ad0c5480e034b
-    Reviewed-on: https://code.wireshark.org/review/5953
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I8891ec90244ffd9609d8443df631a7c8e6453b7e
+    Reviewed-on: https://code.wireshark.org/review/15942
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit ccf0573
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Dec 20 23:18:05 2014 +0100
+commit 946b037
+Author: Samiran Saha <ssahasamiran@gmail.com>
+Date:   Thu Jun 16 17:15:06 2016 +0530
 
-    Qt: rename SummaryDialog class to CaptureFilePropertiesDialog
+    MKA: Fix for GCM-AES-256 dissection & Added Enumeration for macsec-cipher-suite
     
-    Change-Id: I79aa63621853ff15b8c568e1c7949fb8fa0caca2
-    Reviewed-on: https://code.wireshark.org/review/5929
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: Ief38f949d3e30754a65fbfeaa64cbbd2f5646a9b
+    Reviewed-on: https://code.wireshark.org/review/15969
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit bcaf1f4
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sun Dec 21 10:13:00 2014 -0800
+commit 7d6e3e0
+Author: Thomas Shen <thomashen@gmail.com>
+Date:   Wed Jun 15 14:26:02 2016 -0700
 
-    Qt: Better accordion frame layout.
-    
-    Calling invalidate + activate on the parent layout has better results
-    than calling adjustSize on the parent widget.
+    NSH: Correct the display of the NSH header fields
     
-    Change-Id: I844bee49b868d988b0fc93a72687407adf232ef9
-    Reviewed-on: https://code.wireshark.org/review/5951
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I3be75d20a3f00091aa3077e475f9ddb00eeca06c
+    Reviewed-on: https://code.wireshark.org/review/15963
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit bd19532
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Dec 21 19:25:39 2014 +0100
+commit 44ba346
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Thu Jun 16 14:32:58 2016 +0200
 
-    Do not use packet scope memory outside packet dissectors
+    gtk: Check chunk before g_string_chunk_clear
     
-    Otherwise it will trigger an assert
-    Fixes a regression introduced in gf002332
+    Avoid this warning from wireshark-gtk:
+     (wireshark-gtk:39505): GLib-CRITICAL **: g_string_chunk_clear: assertion
+     'chunk != NULL' failed
     
-    Change-Id: I0cffa2c952b7eff085a1834ebabfec03342095bd
-    Reviewed-on: https://code.wireshark.org/review/5950
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I413b3435a1ac595236dd1c4e619e3af1543b6a91
+    Reviewed-on: https://code.wireshark.org/review/15970
+    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 9fbede8
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Dec 21 18:26:19 2014 +0100
+commit d3bb3a0
+Author: Victor Barratault <victor.barratault@gmail.com>
+Date:   Tue Jun 14 12:17:54 2016 -0400
 
-    no need for if(tree)
+    Typing error line 4928 of packet-dns.c
     
-    Change-Id: Ie06738d99851b35e53effb50b2c109ce50e9c6df
-    Reviewed-on: https://code.wireshark.org/review/5949
+    Change-Id: I1a6409262614a87c159236375223707c85114650
+    Reviewed-on: https://code.wireshark.org/review/15972
     Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit 9c03655
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Dec 21 08:04:50 2014 -0800
+commit 44e3212
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Wed Jun 15 22:23:46 2016 -0700
 
-    [Automatic manuf, services and enterprise-numbers update for 2014-12-21]
+    gitignore: updated cmake paths
     
-    Change-Id: I08b7be1ab911e8f578173a45dc2055a81e8cbffb
-    Reviewed-on: https://code.wireshark.org/review/5945
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    * files.txt: v2.1.0rc0-2918-g2e23b50 ("Add checkAPI calls to CMake.")
+    * epan: v2.1.0rc0-2202-g6b54fbf ("CMake: Add more structure to
+      libwireshark build")
+    * asn1: v2.1.0rc0-2330-g54a520d ("Move /asn1 to /epan/dissectors")
+    
+    Change-Id: I0ef590de7d262d96c011be360b958fbda72a61fa
+    Reviewed-on: https://code.wireshark.org/review/15961
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
 
-commit f002332
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Dec 19 21:42:14 2014 -0500
+commit dabbaaf
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Sat Feb 28 17:44:27 2015 +0100
 
-    Replace ether_to_str with either address_to_str or tvb_ether_to_str.
+    filesystem: Fix build dir detection when using cmake
     
-    Change-Id: I8cce9fddbfe950e27e96ea8a5a6d2e0921ff4260
-    Reviewed-on: https://code.wireshark.org/review/5933
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Fixes loading of plugins by detecting the build output directory of
+    cmake. This requires a "CMakeCache.txt" file to be present in the parent
+    directory (above run/).
+    
+    Change-Id: I297432cdcd0981646058410f3eadf5f73b5248c8
+    Reviewed-on: https://code.wireshark.org/review/7453
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit cdaa669
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Dec 19 18:13:17 2014 -0500
+commit 897f9f7
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Jun 15 13:17:41 2016 -0700
 
-    Replace ax25_to_str and get_ax25_name with address_to_str.
+    Add a note about the new intelligent scroll bar.
     
-    Change-Id: I74ddb6fc629ef32b217dede7a3ba652cbbf5ab12
-    Reviewed-on: https://code.wireshark.org/review/5932
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Should we call it the intelligenter scroll bar?
+    
+    Change-Id: I67e76c1aabeb4b2e87e38815fe4ab120f0869b25
+    Reviewed-on: https://code.wireshark.org/review/15936
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 6f8de87
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Dec 21 07:27:01 2014 -0500
+commit 50591ac
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Wed Jun 15 19:53:45 2016 -0700
 
-    Allow "cba" filter prefix for hf_ fields (missed a Profinet file the first time)
+    CID 1250642: check the return value of dup()
     
-    Change-Id: I3ff65a8f6307a9ee08e173c0b2658d96985e0c45
-    Reviewed-on: https://code.wireshark.org/review/5943
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    abort if it is -1
+    
+    Change-Id: Ie14c18679ff74529731558d6742f63ebfb9fe97b
+    Reviewed-on: https://code.wireshark.org/review/15958
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit da22067
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Dec 21 10:28:03 2014 +0100
+commit b223d64
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Thu Jun 16 00:04:36 2016 -0400
 
-    Qt: keep "Copy to clipboard" button active when closing the capture_file_properties_dialog
+    Make the rest of the Diameter AVP names unique.
     
-    As the Capture File Properties window content is kept once the capture is closed, allow to copy it
+    In most cases this means prepending the application- or vendor-name to force
+    uniqueness.  A few vendors have duplicates within their namespace--append the
+    AVP code to these.
     
-    Change-Id: I11466e102fcf75a31aaa22225861ad8bf27f89a8
-    Reviewed-on: https://code.wireshark.org/review/5942
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Also fix a few other invalid names (with spaces or parentheses in the names).
+    
+    Change-Id: I5bb78d31526122dd5782055638af410cc497e49d
+    Reviewed-on: https://code.wireshark.org/review/15960
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit fda12fb
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Dec 19 21:26:23 2014 +0100
+commit f749a64
+Author: Balint Reczey <balint@balintreczey.hu>
+Date:   Tue Jun 14 22:29:34 2016 -0700
 
-    Fix Python 3 compatibility in LocatePythonModule
+    cmake: Detect proper large file defines even with -Wno-error
     
-    Regression introduced with cb345eb4bd0149b4a71d6069f957600a83cc3417.
+    Without this change large file support was detected as available
+    even when it was not without additional flags on 32 architectures.
     
-    Change-Id: I625432ac4572d2449cb6981a158e46c560a81f1a
-    Reviewed-on: https://code.wireshark.org/review/5883
-    Reviewed-by: Maarten Bezemer <maarten.bezemer@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    As a result mergecap and other programs are built without large
+    file support causing mergecap not being able to write files
+    bigger than 2GB on i386 systems. This used to work properly
+    with autotools builds, but not with CMake ones.
+    
+    Change-Id: Ibfd043342b2a48310d2ac9d760e6404a701c5808
+    Reviewed-on: https://code.wireshark.org/review/15937
+    Petri-Dish: Balint Reczey <balint@balintreczey.hu>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
 
-commit deb49cb
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Dec 20 23:32:23 2014 -0800
+commit 4962ea6
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Wed Jun 15 00:47:44 2016 +0200
+
+    qt: move free_stat_tables from SimpleStatisticsDialog::fillTree to ~SimpleStatisticsDialog.
+    
+    Add a reference count to stat_tap_table_ui to prevent bad deallocations.
+    
+    Bug: 12437
+    Change-Id: Ib9b1f929d08a574c306dc755ec416ab94a3fd6d3
+    Reviewed-on: https://code.wireshark.org/review/15920
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit a38db78
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Wed Jun 15 13:25:44 2016 -0400
 
-    Add comments, change structure member name.
+    Update the X11 dissector to use the latest mesa and xcbproto.
     
-    "GSList *" implies a list; call the pointer in a struct
-    heur_dissector_list "dissectors", to indicate what it's a list *of*.
-    
-    Change-Id: Idf5011e08d35d28934cd52f818b945db1cc7f37b
-    Reviewed-on: https://code.wireshark.org/review/5941
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ia1395cffaebbcf6585b9167861d8c3b4d86cf821
+    Reviewed-on: https://code.wireshark.org/review/15923
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit a138faf
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Dec 20 23:25:55 2014 -0800
+commit d1d27bd
+Author: Balint Reczey <balint@balintreczey.hu>
+Date:   Wed Jun 15 19:16:42 2016 -0700
 
-    Clean up some error messages.
+    Qt: Clarify follow stream dialog's format button
     
-    Correct one message, change another one from a g_assert() to a g_error()
-    with descriptive text.
+    The stream is not just shown, but also saved in ASCII, EBDIC, Raw, etc.
     
-    Change-Id: I667beb08ac1677205a9323ab623ed0a9766bac79
-    Reviewed-on: https://code.wireshark.org/review/5940
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ic29e3273ebb9a3eca0fe791bdd48606c4be3b828
+    Reviewed-on: https://code.wireshark.org/review/15957
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 806ebca
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Sun Dec 21 01:55:48 2014 -0500
+commit 8b94a66
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Jun 15 23:35:58 2016 +0200
 
-    packet-PROTOABBREV.c: Update re #includeusage
+    X11: Fix last indent issue on X11 generator
     
-    - packet.h should be first Wireshark #include
-      after config.h and "system" includes.
-    - '#include <glib.h>' not needed.
+    and regenerate X11 dissector
     
-    Change-Id: Ibec076818f3f509aabb4d240e939ef719f3798d6
-    Reviewed-on: https://code.wireshark.org/review/5939
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: If2c781d346713f5a2a2e97de84c0fedcfd1958af
+    Reviewed-on: https://code.wireshark.org/review/15944
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit ce211a4
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Sun Dec 21 01:41:34 2014 -0500
+commit a9d9d4f
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Jun 15 22:52:18 2016 +0200
 
-    Cleanup use of #includes in a few recently committed dissectors.
+    x11: Regenerate dissector after indent change on g2b8caf31cca
     
-    Change-Id: Ie66d4c3f0c5d0037cac65ff39e4dedcedff462f1
-    Reviewed-on: https://code.wireshark.org/review/5938
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: Iac1522998c5983b417a0083b9c607a60e7f66e8c
+    Reviewed-on: https://code.wireshark.org/review/15943
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit b5d7b7a
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Sat Dec 20 16:23:59 2014 -0500
+commit b5a8c4f
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jun 16 01:25:03 2016 +0200
 
-    Cleanup use of #includes in non-generated epan/dissector/*.c
+    randpktdump: fix a crash.
     
-    Specifically:
-    - Set packet.h to be the first wireshark #include after
-       config.h and "system" #includes.
-       packet.h added as an #include in some cases when missing.
-    - Remove some #includes included (directly/indirectly) in
-       packet.h. E.g., glib.h.
-       (Done only for those files including packet.h).
-    - As needed, move "system" #includes to be after config.h and
-       before wireshark #includes.
-    - Rework various #include file specifications for consistency.
-    - Misc.
+    Randpktdump requires the init the wtap opttypes.
+    Fixed making the init function public and calling it.
     
-    Change-Id: Ifaa1a14b50b69fbad38ea4838a49dfe595c54c95
-    Reviewed-on: https://code.wireshark.org/review/5923
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Bug: 12539
+    Change-Id: I02585c41012deacff1526b51ed09ab555cbfc8ce
+    Reviewed-on: https://code.wireshark.org/review/15951
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 14cff7b
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sat Dec 20 20:33:45 2014 -0800
+commit 79aab92
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Wed Jun 15 23:57:39 2016 +0200
 
-    Qt: Don't clear the capture file properties.
+    Don't call g_ascii_strcasecmp() with an NULL string.
     
-    Don't clear the contents of the capture file properties dialog when the
-    capture closes. Retaining the contents lets users compare the properties
-    for multiple files.
-    
-    Change-Id: I6bf684e7bd996f22032ec3d0adcddc343bb17992
-    Reviewed-on: https://code.wireshark.org/review/5937
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I6efbdcb51efe5f2db233827e32e2105db6322d6c
+    Reviewed-on: https://code.wireshark.org/review/15946
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 35571f8
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sat Dec 20 20:06:43 2014 -0800
+commit 83b2d5e
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jun 16 02:34:27 2016 +0200
 
-    Qt: Fix accordion frame height calculation.
+    gtk: add initializer (CID 1362745).
     
-    Change-Id: I32d2ea2ff34544e285b52e4e35e035306c33d3aa
-    Reviewed-on: https://code.wireshark.org/review/5935
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Ib1bc11e905b0a4e84302e3f9ac43f3a87afd6edf
+    Reviewed-on: https://code.wireshark.org/review/15954
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit 2b006ad
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Dec 20 20:13:28 2014 -0800
+commit 66d26d7
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Wed Jun 15 22:01:31 2016 -0400
 
-    Have a heur_dissector_list_t be an opaque handle.
-    
-    This allows dissector lists to be looked up by name, so they can be
-    shared by multiple dissectors.
+    Remove a bunch of unassigned ETSI AVPs.
     
-    (This means that there's no "udplite" heuristic dissector list, but
-    there shouldn't be one - protocols can run atop UDP or UDPLite equally
-    well, and they share a port namespace and uint dissector table, so they
-    should share a heuristic dissector table as well.)
+    These were presumably there to allow indexed search of the AVP list but it
+    wasn't working anyway (binary search was used).  And the expert info for
+    "unknown" (to Wireshark) AVPs is a good thing.
     
-    Change-Id: Ifb2d2c294938c06d348a159adea7a57db8d770a7
-    Reviewed-on: https://code.wireshark.org/review/5936
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Id6b9e5c90b8a2a6e3cf4415cd1b6114308c74440
+    Reviewed-on: https://code.wireshark.org/review/15956
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 8179800
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Dec 20 22:27:54 2014 +0100
+commit 38afb1d
+Author: Rudra Rugge <rudrarugge@gmail.com>
+Date:   Wed Jun 15 15:22:25 2016 -0700
 
-    Qt: fix a crash when closing a file while capture file properties window is open
+    ip-over-ib description entry was missing
     
-    refresh_button_ and copy_comment_button_ are not used neither initialized, get rid of them
-    Also clear text areas and disable buttons
+    Description entry was missing in the list.
     
-    Change-Id: I418d712313041dcf4f15aceee01497f01ae74918
-    Reviewed-on: https://code.wireshark.org/review/5927
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: Ia8f8bd4608ee6800a352f4979752b5c45c4a5086
+    Reviewed-on: https://code.wireshark.org/review/15947
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 86d1b54
+commit 37c40bd
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Dec 20 23:30:12 2014 +0100
+Date:   Wed Jun 15 18:06:04 2016 -0700
 
-    Qt: disable Capture File Properties toolbar icon by default
+    Export wtap_optionblock_copy_options() symbol
     
-    Otherwise it can be opened by clikcing on the icon just after launching Wireshark
-    Also update tooltip to match the exact dialog name
+    It can be useful for wiretap plugins
     
-    Change-Id: I5ce5e0c24f3dfb44c2303c78114102c5c03ccc88
-    Reviewed-on: https://code.wireshark.org/review/5930
+    Change-Id: Ic56e4357ba3bfcef30d13615efc1361399c3133e
+    Reviewed-on: https://code.wireshark.org/review/15955
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit cadf1a5
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Dec 18 22:12:55 2014 -0500
+commit 60578aa
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Wed Jun 15 13:42:56 2016 -0700
 
-    Remove profinet_type from packet_info structure.
+    file_util.c: do not search in Npcap installation folder when calling ws_load_library()
     
-    Profinet I/O and DCOM CBA had completely separate uses for the profinet_type member, so it's okay to separate them with different proto ids tracking the proto_data.
+    ws_load_library() is not used to load packet.dll or wpcap.dll (we use ws_module_open() for this).
+    Let's not lose time checking the folder content.
     
-    Change-Id: I7b9c01b8d4f74d51fe9f9ef2f957479dff0a7157
-    Reviewed-on: https://code.wireshark.org/review/5852
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: Ibd4a71b8b0c5ffc0c4c146eca51ad9f20964515b
+    Reviewed-on: https://code.wireshark.org/review/15938
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit d7fd00d
-Author: Luke Mewburn <luke@mewburn.net>
-Date:   Sun Dec 21 01:05:07 2014 +1100
+commit b2c7e8e
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Wed Jun 15 13:02:39 2016 -0700
 
-    MIPv6: simplify fixed point degrees conversion
+    mongo: return the number of bytes we actually consumed
     
-    * Simplify the conversion of degrees from 24 bit fixed point to a float.
-      Avoids strict-aliasing warning by gcc 4.4.
-    * Add reference to RFC 6757.
-    * Correct spelling of 'convert' in degrees_convert_fixed_to_float().
+    even if the document length is 0, we consumed at least 4 bytes for the
+    length field
     
-    Change-Id: Icb680d009fdd960e8668fa3020060799d6a74c2f
-    Reviewed-on: https://code.wireshark.org/review/5913
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 210aaf1
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Dec 20 15:00:57 2014 -0800
-
-    Use "" rather than <> for includes; that might fix ABI check failures.
-    
-    Change-Id: I80e291031e4e8e347422e4a1e636d2ce40efc5c2
-    Reviewed-on: https://code.wireshark.org/review/5931
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    bug: 12534
+    Change-Id: I2f1612bf575b558c1bcc0afe8202b202747846e3
+    Reviewed-on: https://code.wireshark.org/review/15934
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit ac69a6d
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sat Dec 20 14:11:31 2014 -0800
+commit c5528d0
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Wed Jun 15 18:40:53 2016 -0400
 
-    Qt: Use an accordion frame in the welcome screen.
+    Make some more Diameter AVP names unique.
     
-    Place the recent files list in an accordion frame so that showing and
-    hiding is more visually smooth.
+    In some cases this means using the correct (updated?) name from the
+    specification. In others it means prepending the application- or vendor-name
+    to force uniqueness.
     
-    Change-Id: Ifdc534a33aa9f93949c9f919cfe0765fbfcde750
-    Reviewed-on: https://code.wireshark.org/review/5924
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit d11e94b
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sat Dec 20 14:08:04 2014 -0800
-
-    Remove debugging code.
+    Remove a few more "Unassigned" AVPs from the XML files.
     
-    Change-Id: If3a64a6914ae8ce2521c85766df6f733a13ca7e1
-    Reviewed-on: https://code.wireshark.org/review/5926
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I61d55ef97ff8efc3317c91bf79e73031735f740a
+    Reviewed-on: https://code.wireshark.org/review/15949
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit b4e90bd
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Sat Dec 20 20:09:00 2014 +0100
+commit e551731
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Wed Jun 15 14:06:23 2016 -0700
 
-    Fix filter test for multifield custom column
+    idl2wrs: fix code generation
     
-    This adds support for "field||field" without spaces.
+    Fixes a regression from v1.99.9rc0-470-g87f2bd4 which truncated function
+    names to 26 characters.
     
-    Change-Id: Ia738d6642d12a188d1629bbdd9701cc8f8bb7a68
-    Reviewed-on: https://code.wireshark.org/review/5922
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 8b24471
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Dec 19 16:27:57 2014 -0800
-
-    Qt: Revert back to an all-in-one main window.
+    Test:
     
-    Switch back to having everything on the main window similar to GTK+.
-    It's more cluttered but this way but you don't have to navigate the task
-    selector to get to the recent files and help links.
+        cd epan/dissectors/dcerpc/budb
+        make IDL2WRS=/tmp/wsbuild/run/idl2wrs
+        diff packet-dcerpc-budb.c ../../packet-dcerpc-budb.c
     
-    Retain the "Capture", "Open", and "Learn" imperative text. Move "Open"
-    to the top as suggested by Michal.
+    While at it, replace all g_strndup(X, strlen(X)) occurrences with
+    g_strdup(X) since that is the same thing and less redundant.
     
-    Change-Id: Iaf7d93f9caf686b5cbeb640e5e5f95ecb46f7f2d
-    Reviewed-on: https://code.wireshark.org/review/5896
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Id8da45792c830e2287cf8f14ff6245149751afd2
+    Reviewed-on: https://code.wireshark.org/review/15939
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 2b621e2
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Dec 19 11:42:19 2014 +0100
+commit 1708e2e
+Author: Balint Reczey <balint@balintreczey.hu>
+Date:   Wed Jun 15 15:40:15 2016 -0700
 
-    802.11: VHT NDP announcement frame is no correctly decode when there is FCS
+    gtk: Fix null dereference in stats
     
-    The FCS at the end of the frame is decoded as additional STA info fields which does not seem correct.
+    This fixes the bug reported to Debian:
+    https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=786704
     
-    Issue reported by Sudheer
-    Bug:10786
-    Change-Id: Idffaa41cd7c79ad4c9937e7f32aa2444c1b9033f
-    Reviewed-on: https://code.wireshark.org/review/5849
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: Iabe19c11067318d78664a17fa00d6a4d1998250c
+    Reviewed-on: https://code.wireshark.org/review/15948
+    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
 
-commit 851909d
+commit fb38049
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Dec 20 18:39:51 2014 +0100
+Date:   Wed Jun 15 14:50:03 2016 -0700
 
-    FCoIB / Infiniband SDP: prevent a crash when 'enable manual settings' is set without filling address field
+    proto.c: allow calling proto_item_add_bitmask_tree() with a length set to 0
     
-    Bug: 10796
-    Change-Id: Ifdb7804ec5e1146b08f00e54647d802a69d52113
-    Reviewed-on: https://code.wireshark.org/review/5914
-    Tested-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>
+    This is required for the flags from packet-frame.c
+    
+    Bug: 12536
+    Change-Id: I60bfe671687bcd3a9b5c997ba62bed563e890548
+    Reviewed-on: https://code.wireshark.org/review/15945
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 326e496
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Dec 20 18:40:45 2014 +0100
+commit c3190ad
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Jun 15 20:35:47 2016 +0200
 
-    no need for if (tree)
+    capture info (wslua): Dereference of null pointer
     
-    Change-Id: I0749f8e10d6f8d97b85da6bb52b0ab336ba06c38
-    Reviewed-on: https://code.wireshark.org/review/5919
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+    Change-Id: Iced579d5acaefa9d1c8e3775a53916773bf87659
+    Reviewed-on: https://code.wireshark.org/review/15929
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
 
-commit 7d18248
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Dec 20 18:41:16 2014 +0100
+commit a8f73e9
+Author: Balint Reczey <balint@balintreczey.hu>
+Date:   Wed Jun 15 14:14:23 2016 -0700
 
-    hide the hf_msmms_data item, not the NULL item
+    documentation: Suggest using prefixed public symbols
     
-    Change-Id: If92c9bc281f44de8f3b1de71005240755748403a
-    Reviewed-on: https://code.wireshark.org/review/5918
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+    Change-Id: I9153756b0e921fd74d7df9d119337f5484856ba0
+    Reviewed-on: https://code.wireshark.org/review/15940
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 7b2ae71
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Fri Dec 19 09:21:20 2014 +0100
+commit 04058b8
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Jun 15 11:27:53 2016 -0700
 
-    Fix filter valid/invalid test for multifield custom type
+    Qt: Adjust the search frame layout.
     
-    Check for "or" or "||" (also ignore whitespaces)
-    and check both arguments of this operator to be
-    fieldname (character check), then check whole filter is valid
-    for dfilter compiler.
+    Add padding on the left side of the search frame in order to reduce the
+    amount of mousing required on large screens.
     
-    Change-Id: I412b5dc1fca16fcd2b640aa74af81167300fd11e
-    Reviewed-on: https://code.wireshark.org/review/5848
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: I1dcd8c4a103f4a462f4ab60a22a93b8c0f28b055
+    Reviewed-on: https://code.wireshark.org/review/15928
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit abd90c3
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Dec 20 09:47:01 2014 -0800
+commit 66efbdb
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Wed Jun 15 16:01:05 2016 -0400
 
-    Fix handling of 3-component OS version numbers.
-    
-    Get rid of doubled square brackets (what were those for?), and match
-    dots in the version number with "\.", so we only match dots.
+    Make some Diameter AVP names unique.
     
-    This fixes the handling of version numbers such as 10.10.1.
+    In some cases this means using the correct (updated?) name from the
+    specification. In others it means prepending the application name to force
+    uniqueness.
     
-    (A 2-component version number doesn't match, but that's OK - the sed
-    command doesn't use -n, so that just means it's unchanged by the
-    command.)
-    
-    Change-Id: I3046133de732c80410592272d1f7b961a64d9289
-    Reviewed-on: https://code.wireshark.org/review/5915
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I8301c769af2b2279c0be7c1bc65e99fe25c1cc80
+    Reviewed-on: https://code.wireshark.org/review/15935
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 9ba9cd8
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Sep 9 16:42:58 2014 -0400
+commit 1b0d51f
+Author: dsrsupport <eugene.exarevsky@dsr-company.com>
+Date:   Wed Jun 15 19:45:50 2016 +0300
 
-    Qt: Add a CaptureFile class.
+    ZigBee: decode ZBOSS traffic dump and Interpan frames as ZigBee.
     
-    Wrap the capture_file struct in a QObject which translates cf_cb_* and
-    capture_cb_* events into signals. Move the global cfile to
-    capture_file.cpp.
+    If decoded ZBOSS traffic dump, sure this is ZigBee, so bypass heuristic.
+    If decoding air sniffer dump, try to go thru heuristic by checking for ext address src mode required for interpan.
     
-    Don't use a void pointer for the capture file struct.
-    
-    Change-Id: Ic5d5efb4bb1db64aa0247245890e5669b1da723a
-    Reviewed-on: https://code.wireshark.org/review/5885
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Iddf799400a4cf0fd73714f06b99e3d11c8cb2e60
+    Reviewed-on: https://code.wireshark.org/review/15921
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 2bb8255
+commit 561a063
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Dec 16 14:36:04 2014 -0800
+Date:   Fri Jun 10 15:26:57 2016 -0700
 
-    Consolidate RTP stream structs.
+    Pass "/utf-8" to Visual C++ 2015.
     
-    Consolidate the three different RTP stream structs in ui/rtp_stream.h,
-    ui/gtk/rtp_player.c, and ui/voip_calls.c into one. Make the member names
-    a bit more consistent. Document what each GList contains. Use nstime_t
-    for timestamps since that's what we get from the frame data. Use g_new0
-    to initialize our structs.
+    Many projects (Qt[1] and GNOME[2] in particular) either recommend, use,
+    or at least allow for UTF-8 in source and header files. Pass /utf-8 to
+    Visual C++ 2015 so that it will behave itself around UTF-8 and be more
+    like that nice compiler down the street.
     
-    Change-Id: I2b3f8f2051394a6a98a5c7bc49c117f07161d031
-    Reviewed-on: https://code.wireshark.org/review/5843
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    [1] https://wiki.qt.io/Strings_and_encodings_in_Qt
+    [2] https://bugzilla.gnome.org/show_bug.cgi?id=767218
+    
+    Change-Id: Ibc90d235742134cb42dd796ba529699bcbbe3ad0
+    Reviewed-on: https://code.wireshark.org/review/15821
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 79b5bb4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Dec 20 00:57:20 2014 -0800
+commit ca1c5f5
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Jun 15 20:14:18 2016 +0200
 
-    Fix typo.
+    diameter (3GPP): Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
     
-    One position off on the keyboard and everything falls apart.
-    
-    Change-Id: I00909ca3344642d3eeaae0d8563403b56cc62f79
-    Reviewed-on: https://code.wireshark.org/review/5912
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Iaa74265df66455528c86658a26812876574a904a
+    Reviewed-on: https://code.wireshark.org/review/15927
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit a61f6e4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Dec 20 00:23:05 2014 -0800
+commit 6d89f3b
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Wed Jun 15 13:31:41 2016 -0400
 
-    When checking for floorl(), include math.h.
-    
-    It's not being found with MSVC, but is apparently present; perhaps
-    math.h does something magic, e.g. defining it as a macro, so try using
-    check_symbol_exists with "math.h".
+    Update to the latest config.guess and config.sub
     
-    Change-Id: Idaecac641fb0b87d399807d8bf1fcb74e7251a4e
-    Reviewed-on: https://code.wireshark.org/review/5911
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Id493fb3b79326b522a3a11c3258531683f159187
+    Reviewed-on: https://code.wireshark.org/review/15924
+    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 4b8639f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 19 21:18:27 2014 -0800
+commit 64169e3
+Author: dsrsupport <eugene.exarevsky@dsr-company.com>
+Date:   Wed Jun 15 18:48:01 2016 +0300
 
-    Add a check for floorl().
+    ZigBee: add support for inter-pan transmissions.
     
-    Also, we don't use NEED_STRPTIME_H, we use HAVE_STRPTIME.
+    Added dissection of inter-pan nwk and aps stub to be used to decode ZLL commissioning cluster.
     
-    Change-Id: I330e8ce408c05b74c50f3369691283e35e68505c
-    Reviewed-on: https://code.wireshark.org/review/5910
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I871016a93854f1caf2f14f2f84e5397de5f1e2ff
+    Reviewed-on: https://code.wireshark.org/review/15918
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 4d3c7b5
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 19 21:09:18 2014 -0800
+commit 6baa1b5
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Wed Jun 8 15:57:00 2016 +0200
 
-    Don't bother with __builtin_floorl().
+    Remove Nmake build system
     
-    At least as I read the GCC documentation, if GCC supports a builtin
-    floorl() at all, it will always treat floorl() and
-    __builtin_floorl() the same (it's reserved in C90 and defined in C99, so
-    nobody should ever write C code assuming floorl() won't be treated in
-    that afshion).
-    
-    In addition, the GCC 3.3.6 manual says nothing about __builtin_floorl(),
-    so it probably won't help to use it.  If it appears to help, there's
-    probably something else going on.
-    
-    Also, GCC appears not to like "#ifdef (__GNUC__)", as the parentheses
-    mean it's testing an expression, not a macro name.
-    
-    Change-Id: Ib88b52c366d7f3b1637bb408fb18d04b67c27e4b
-    Reviewed-on: https://code.wireshark.org/review/5909
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61
+    Reviewed-on: https://code.wireshark.org/review/15777
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
+    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
 
-commit caf4cc6
+commit 88bd50c
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 19 20:45:18 2014 -0800
+Date:   Wed Jun 15 12:15:54 2016 -0700
 
-    Use AC_SEARCH_LIBS() for math functions.
+    Don't map the interface ID for records that don't pertain to an interface.
     
-    Use it to check whether we need -lm for various math functions -
-    including floorl().  Let it handle adding -lm, rather than having that
-    in the various _LDADD macros.
+    And revert to the previous behavior of map_phdr_interface_id(); that
+    change broke the mergecap tests when it was merging pcap files into a
+    pcapng file.
     
-    Change-Id: Ic5d24ec35e060306351f4981c92e26879e597d81
-    Reviewed-on: https://code.wireshark.org/review/5908
+    Change-Id: I2e079b0e87dce06e98faa9ab7615f9b9b2701b77
+    Reviewed-on: https://code.wireshark.org/review/15932
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 1a051af
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 19 20:22:08 2014 -0800
+commit 5a73176
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Wed Jun 15 11:46:53 2016 -0700
 
-    Include <math.h> to declare floor().
+    Win: convert atkversion.h to UTF-8
     
-    Change-Id: I39de31c3e38b83aaec76396048e6960f609bc63e
-    Reviewed-on: https://code.wireshark.org/review/5907
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I7bfa9be11596cc9a3e1b0226c6865edf47e96782
+    Reviewed-on: https://code.wireshark.org/review/15931
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 07fb8cf
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 19 20:11:12 2014 -0800
+commit edf0b5c
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Wed Jun 15 20:05:32 2016 +0200
 
-    Remove trailing white space.
+    qt: add initializer to ExpertPacketTreeWidgetItem (CID 1362746).
     
-    Change-Id: I0777945a5234cf380e2f3bc2461cc638c316f499
-    Reviewed-on: https://code.wireshark.org/review/5906
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I8ca154907e01fb40affb9e5f5a0aaf55921c95db
+    Reviewed-on: https://code.wireshark.org/review/15926
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit b445b3d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 19 19:44:03 2014 -0800
+commit de23fbc
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Wed Jun 15 10:53:43 2016 -0700
 
-    Rename wsutil/floor.[ch] to wsutil/floorl.[ch].
+    zbee-nwk: don't THROW() an exception from a dissector
     
-    That better indicates what they do - they don't supply floor(), as
-    that's a standard math.h feature dating back before C89, they supply
-    floorl().
+    we already have an expert info, so we can just return the number of
+    bytes in the tvb
     
-    Change-Id: Ib1278c51cdfc57680c28c51de87eafb2cb50c8eb
-    Reviewed-on: https://code.wireshark.org/review/5905
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I6199760316d7ef141877bc8f65012d36e4dd357b
+    Reviewed-on: https://code.wireshark.org/review/15925
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit b925c35
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 19 19:36:21 2014 -0800
+commit ec5acbc
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri Mar 11 18:42:49 2016 +0100
 
-    We assume all versions of MSVC have floorl().
+    wtap: Make default_filter static
     
-    If not, we'll have to play some games in config.nmake.
+    Address of stack memory associated with local variable 'default_filter'
+    is still referred to by the global variable 'filter_option' upon returning
+    to the caller.  This will be a dangling reference.
     
-    Change-Id: I1dbc5d4ef41ede0e596dbe40b4e139e0f6c39dba
-    Reviewed-on: https://code.wireshark.org/review/5904
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I6160a37f05b8aea245b723ec50803e4062886738
+    Reviewed-on: https://code.wireshark.org/review/14427
+    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 1088629
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 19 18:59:55 2014 -0800
+commit 9ba9a05
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Wed Sep 30 14:34:39 2015 +0100
 
-    If we don't have GCC, fall back on using floor().
-    
-    Add the closing brace for the function body while we're at it.
+    Display "IP DSCP" column as short text
     
-    Change-Id: I73170fdc0885972dce531b553ff8601cceea182e
-    Reviewed-on: https://code.wireshark.org/review/5902
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Ping-Bug: 12429
+    Change-Id: I618b2017e161d89f0efa25ce2fb82a1808e8d315
+    Reviewed-on: https://code.wireshark.org/review/10701
+    Reviewed-by: João Valverde <j@v6e.pt>
 
-commit b736896
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 19 18:53:31 2014 -0800
+commit babb9e3
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Wed Jun 15 08:45:54 2016 -0700
 
-    Handle floorl() the same way we handle other not-on-all-platforms functions.
-    
-    Use AC_CHECK_FUNC() for it, define FLOORL_LO to floorl.lo if we *don't*
-    have it, add FLOORL_LO to the list of items conditionally built in
-    libwsutil, and include "wsutil/floor.h" only if HAVE_FLOORL is *not*
-    defined, as that means it's *not* supplied by the platform and thus
-    *not* declared in <math.h>.
+    androiddump: fix leak on --extcap-interfaces
     
-    Also, use the standard export stuff in wsutil/floor.h.
+    extcap_base_register_interface duplicates the memory, so there is no
+    need to keep it around.
     
-    Change-Id: Ic24aa69f65f2d15450d8b84b0c2b0c58f38edebe
-    Reviewed-on: https://code.wireshark.org/review/5901
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I2bac8be519b659504c512d4eb29be8f7ef6dbd59
+    Reviewed-on: https://code.wireshark.org/review/15919
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 201a7e7
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Fri Dec 19 19:28:59 2014 -0700
+commit 95a0579
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Wed Jun 15 08:24:48 2016 -0700
 
-    Change more variables from si_code to mtp3_si_code to avoid conflicts
-    with a #define in a NetBSD header file.
+    win-setup.ps1: stop downloading user-guide; with CMake it is generated from source code
     
-    Change-Id: I2136db207cb4707571920b373708fcb63505131c
-    Reviewed-on: https://code.wireshark.org/review/5900
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
+    Change-Id: I3b015594bd6a6b0c41938ba17d5690c08e04f490
+    Reviewed-on: https://code.wireshark.org/review/15917
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 556f9a5
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 19 18:00:50 2014 -0800
+commit 525fd71
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Jun 14 23:17:25 2016 -0400
 
-    Include floor.c and floor.h in the source tarball.
+    proto_tree_add_boolean -> proto_tree_add_bitmask_list_value
     
-    Change-Id: Iabc0403643a05eaa7dbd525a94bc720d100d54d5
-    Reviewed-on: https://code.wireshark.org/review/5899
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ic644042d238b5f2abcd874bca92c6dea55804ba9
+    Reviewed-on: https://code.wireshark.org/review/15913
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 2f44afe
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 19 17:56:17 2014 -0800
+commit d25a60c
+Author: Gerald Combs <gerald@zing.org>
+Date:   Sun Apr 24 11:21:50 2016 -0700
 
-    Use ENCTYPE_NULL in the krb5_crypto_init() call.
+    More Sysdig / system event support.
     
-    That appears to be a name supplied both by MIT and Heimdal Kerberos.
-    Using it makes it a bit clearer what the code is doing, and might avoid
-    type clash warnings if it's the right type (e.g., if it's a member of an
-    enum, as it is in Heimdal, and the corresponding argument to
-    krb5_crypto_init() is of the same type, the types will match).
+    Add REC_TYPE_SYSCALL to wiretap and use it for Sysdig events. Call the
+    Sysdig event dissector from the frame dissector. Create a "syscall"
+    protocol for system calls, but add "frame" items to it for now.
     
-    Change-Id: I81b79223f789b8d1ec47180b7636ac1d83e03681
-    Reviewed-on: https://code.wireshark.org/review/5898
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Add the ability to write Sysdig events. This lets us merge packet
+    capture and syscall capture files.
+    
+    Change-Id: I12774ec69c89d8e329b6130c67f29aade4e3d778
+    Reviewed-on: https://code.wireshark.org/review/15078
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 2376953
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Fri Dec 19 17:44:37 2014 -0700
+commit b26e757
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Wed Jun 15 08:53:14 2016 +0200
 
-    Another missing change
+    Let the calculated window scale be 16 bit wide.
     
-    Change-Id: Icaaaeda75f411ecc7cf3027440c8af2b85021be3
-    Reviewed-on: https://code.wireshark.org/review/5897
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
+    Even though TCP window scale shift is only 8 bits, the scale
+    calculated from it is max 16384. therefor a 16 bit value.
+    Let the tree item map to the single byte in the TVB, while
+    allowing the value to be 16 bit.
+    
+    Bug: 12525
+    Change-Id: I41cebc62f6b8b09e13efa5f3b7432001e8d994e1
+    Reviewed-on: https://code.wireshark.org/review/15914
+    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 71fc2f8
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Fri Dec 19 17:27:30 2014 -0700
+commit 0ef1d94
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Jun 14 11:55:08 2016 -0400
 
-    Another missing change, to include floor.h
+    Allow control of individual columns to be (un)writable.
     
-    Change-Id: Ice962bb9d62ab99f225228bf1e78850947eea625
-    Reviewed-on: https://code.wireshark.org/review/5895
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
+    Most protocols just want to limit COL_INFO or COL_PROTOCOL
+    so give that level of granularity.
+    
+    Bug: 12144
+    Bug: 5117
+    Bug: 11144
+    Change-Id: I8de9b7d2c69e90d3fbfc0a52c2bd78c3de58e2f8
+    Reviewed-on: https://code.wireshark.org/review/15894
+    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit df1f919
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 19 16:20:42 2014 -0800
+commit c19e6c2
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Tue Jun 14 14:52:01 2016 -0700
 
-    Don't use g_slist_free_full().
+    cmake: fix ENABLE_ASAN detection
     
-    It's only in GLib 2.28 or later, but we don't require 2.28.
+    Do not add -fsanitize=undefined when ASAN is requested, UBSAN is a
+    different feature (which could be added later as desired). This makes
+    the -DENABLE_ASAN=1 option match the autotools --enable-asan option.
     
-    Instead, have col_custom_field_ids_free() do what g_slist_free_full() does -
-    and more.
+    Fail hard if ASAN support is requested but not supported, this avoids
+    surprises when something is wrong. Fix ASAN detection by setting the
+    linker option too.
     
-    Change-Id: I15768cfd2d26c847470b02ea6c51830dabcaa7ee
-    Reviewed-on: https://code.wireshark.org/review/5894
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Note: if you have previously set ENABLE_ASAN=1 with the broken ASAN
+    detection, you have to clear your CMakeCache.txt file to redo the
+    detection.
+    
+    Change-Id: Iba6ca0da0336eccedd0cf31a251baad9d1aff5b4
+    Reviewed-on: https://code.wireshark.org/review/15908
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit dba361b
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Fri Dec 19 16:19:25 2014 -0700
+commit 3a59021
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Mon Jun 13 15:28:16 2016 -0400
 
-    Add a missing line related to previous two commits
+    Change how dissectors do late-field-registration to avoid a double-registration
+    assertion.
     
-    (I messed up my local git repo using git branches and stash/stash pops,
-    sorry for all of the extra commits for one change)
+    If a dissector forces registration of fields during dissection it needs to do
+    so in a way that clears the prefix registration.  Otherwise epan will call the
+    registration routine a 2nd time (which will cause us to assert out) if a user
+    types a display filter (with the dissector's prefix) that doesn't exist.
     
-    Change-Id: Ib031ae7d57ba9ea4b19fe13121643799e7563046
-    Reviewed-on: https://code.wireshark.org/review/5893
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
-
-commit aa0a040
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Fri Dec 19 16:11:33 2014 -0700
-
-    Add missing files from last commit
+    Update the proto_register_prefix() comments to reflect this.
     
-    Change-Id: I4a6dd1b60893d19b91f5bc0f85be9ee99cd3eb5e
-    Reviewed-on: https://code.wireshark.org/review/5892
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
+    Change-Id: I3ce29243395fb55192bb5dfd950baa88410ac136
+    Reviewed-on: https://code.wireshark.org/review/15881
+    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
 
-commit 47dc4e7
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Fri Dec 19 23:03:14 2014 +0000
+commit 22fd85d
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Mon Jun 13 18:05:11 2016 -0700
 
-    Revert "Provide a floorl() function (which is currently only able to call GCC's __builtin_floorl() function) for systems which don't provide one." because I left off the new wsutil/floor.[ch] files
+    mount: fix a memory leak
     
-    This reverts commit e2586ec36d0d924b933d2127e809918b980cb413.
+    don't copy the wmem-buffer from address_to_str() into a g_malloc()ed one
+    that is never freed
     
-    Change-Id: Ie38b7f32b2d21e3beba5173eec22ca12b7f5da91
-    Reviewed-on: https://code.wireshark.org/review/5891
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
-
-commit e2586ec
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Fri Dec 19 15:54:04 2014 -0700
-
-    Provide a floorl() function (which is currently only able to call GCC's
-    __builtin_floorl() function) for systems which don't provide one.
+    instead, realloc the wmem-buffer and add the nfs path to it
     
-    Change-Id: Ie0140ff195f0eae525c7bd70c7c3e23039fde569
-    Reviewed-on: https://code.wireshark.org/review/5889
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
-
-commit e7d2c8d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 19 14:07:29 2014 -0800
-
-    Get rid of some accidentally-checked-in debugging stuff.
+    (nfs_name_snoop_add_name() will make a copy internally)
     
-    Change-Id: Iea54df783cdff2424d23ecfba8f219dae42d0c83
-    Reviewed-on: https://code.wireshark.org/review/5888
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I4274a4a413c09f3f1d78beba65d94748ce185413
+    Reviewed-on: https://code.wireshark.org/review/15902
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit f4ffbbb
+commit eb4ed5a
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 19 14:06:04 2014 -0800
+Date:   Tue Jun 14 17:35:51 2016 -0700
 
-    Throw some casts at compiler warnings.
+    Clean up some messages.
+    
+    We're checking for more than just a 64-bit off_t; we're checking for the
+    ability to do 64-bit seeks in files, even if, as on Windows, the APIs
+    are different.
     
-    Change-Id: I609fcba0b015599f98edb1b3927edb5684bcf2b1
-    Reviewed-on: https://code.wireshark.org/review/5887
+    Remove trailing white space and clean up some comments while we're at
+    it.
+    
+    Change-Id: I6122b6d6b44ff5dd3a4d8268f9793193e65817ce
+    Reviewed-on: https://code.wireshark.org/review/15912
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit d4ff430
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Fri Dec 19 14:51:26 2014 -0700
-
-    Move packet-kerberos.c to the dirty dissectors because it generates
-    warnings (at least on NetBSD), presumably due to our use of
-    -Wc++-compat:
-    
-    ../../asn1/kerberos/packet-kerberos-template.c: In function
-    'read_keytab_file':
-    ../../asn1/kerberos/packet-kerberos-template.c:497:10: warning: request
-    for implicit conversion from 'gpointer' to 'struct enc_key_t *' not
-    permitted in C++
-    ../../asn1/kerberos/packet-kerberos-template.c:518:21: warning: request
-    for implicit conversion from 'gpointer' to 'char *' not permitted in C++
-    ../../asn1/kerberos/packet-kerberos-template.c: In function
-    'decrypt_krb5_data':
-    ../../asn1/kerberos/packet-kerberos-template.c:570:3: warning: enum
-    conversion when passing argument 3 of 'krb5_crypto_init' is invalid in
-    C++/usr/include/krb5/krb5-protos.h:1208:1: note: expected 'krb5_enctype'
-    but argument is of type 'int'
-    ../../asn1/kerberos/packet-kerberos-template.c:581:13: warning: request
-    for implicit conversion from 'gpointer' to 'guint8 *' not permitted in
-    C++
-    ../../asn1/kerberos/packet-kerberos-template.c:596:13: warning: request
-    for implicit conversion from 'gpointer' to 'char *' not permitted in C++
-    
-    Change-Id: I17c10fc1df2685ec2e2c1b00cd3b81f62e09c829
-    Reviewed-on: https://code.wireshark.org/review/5886
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
-
-commit 0df4eec
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Fri Dec 19 13:26:22 2014 -0700
-
-    Add parenthesis around some generated code so it compiles.  This new
-    code only shows up when the X11 dissector is updated from the latest
-    xcbproto & mesa, which I will commit real soon now (RSN).
-    
-    Change-Id: Ic750df3b4406f107fd850ade891ee093054c8d6d
-    Reviewed-on: https://code.wireshark.org/review/5882
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
-
-commit fbd6caa
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Fri Dec 19 11:31:07 2014 -0700
-
-    Take out parenthesis around faq.txt rule so it works when automake
-    chooses Korn shell instead of Bourne shell.  It still works with the
-    Bourne shell in my testing.
-    
-    Change-Id: I00bfed22fb0d9bb183637ea5fb111904b8536949
-    Reviewed-on: https://code.wireshark.org/review/5880
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
-
-commit 962fa21
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Dec 18 16:31:43 2014 -0500
+commit 51dd96f
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Tue Jun 14 16:11:18 2016 -0700
 
-    Replace uses of proto_get_frame_protocols with proto_is_frame_protocol when only one protocol is desired.
+    Fix OSX buildbot
     
-    Also use proto_get_frame_protocols in main_menubar.c instead of doing it "manually".
+    Dirty CORBA IDL dissectors must be compiled without -Werror option
     
-    Change-Id: Ie7a365c538700f2cebdd1e3d253f2fd9b189f5cf
-    Reviewed-on: https://code.wireshark.org/review/5851
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I46431c635274399cd6d365a608cdc0aecbc59c95
+    Reviewed-on: https://code.wireshark.org/review/15911
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 398c2cee
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Fri Dec 19 10:01:55 2014 -0700
+commit 38d08e0
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Jun 14 19:35:32 2016 +0200
 
-    Skip over the new 'switch' field in xproto/src/xinput.xml so we can
-    re-generate the x11 dissector again without the script breaking.
+    dns_stats: generate stats just for pure dns (not mDNS, not LLMR).
     
-    Change-Id: I6d24cf098f370f4c1ff191052e2ea67b7875b33a
-    Reviewed-on: https://code.wireshark.org/review/5878
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
+    The stats for mDNS and llmnr are pending. The change just resolves a bug
+    in the stats that are wrongly generated when the traffic is mDNS or LLMR.
+    
+    Bug: 12492
+    Change-Id: Ie772e204d0ddea997dd8cbf609725605c8a507c8
+    Reviewed-on: https://code.wireshark.org/review/15897
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit c11085a
+commit 58023e5
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Dec 19 11:57:19 2014 +0100
+Date:   Tue Jun 14 23:43:15 2016 +0200
 
-    ISIS: Fix warning: '@return' command used in a comment that is attached to a function returning void [-Wdocumentation]
+    proto(.h): fix '@return' command used in a comment that is attached to a function returning void [-Wdocumentation]
     
-    Change-Id: I7f20311125e369cc90df808772323e8e98f8c94e
-    Reviewed-on: https://code.wireshark.org/review/5850
+    Change-Id: Ie0e502adcc8eb00f65ffa6c018d5b9d79655ddb7
+    Reviewed-on: https://code.wireshark.org/review/15907
     Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit f94eb27
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Mon Dec 8 10:06:56 2014 -0700
+commit b7e32bb
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Jun 14 17:23:58 2016 -0400
 
-    Bring pkg.m4 in from pkgconfig version 0.28 so we can use the
-    PKG_PROG_PKG_CONFIG macro to try searching for pkg-config even when
-    it isn't installed.  Without this (and without pkg-config installed)
-    the configure script is broken.  With it, it gives a message saying
-    pkg-config isn't found.
+    FIX dissector - Improve Message info
     
-    Change-Id: I4c5af4cedd8c1927c1e00dd6b42faef3f31b84d4
-    Reviewed-on: https://code.wireshark.org/review/5671
+    Bug: 5350
+    Change-Id: I4b2d60549f9680bbc008a2abba5d7ec108f6bf22
+    Reviewed-on: https://code.wireshark.org/review/15905
     Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 1f03180
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Dec 17 21:55:52 2014 -0500
+commit 581a17a
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Mon Jun 13 15:11:55 2016 -0700
 
-    Use new color_dissector_filters.[ch] to refactor (color) conversation generation in GTK menus.
+    CORBA IDL: compile dissectors with /Ox when using MSVC2013 x64
     
-    Change-Id: I5868a40b71a989a3a1522cb091064bb0aaec6daf
-    Reviewed-on: https://code.wireshark.org/review/5828
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    By default Windows files are compiled with /O2 optimization flag (that brings the best performance).
+    But MSVC2013 x64 compiler generates buggy code for CORBA IDL dissectors.
+    Let's downgrade the optimization to /Ox for those files specifically.
+    
+    Bug: 12495
+    Change-Id: Ibbb532653808d915c82bd20b55dd9e68d86b1207
+    Reviewed-on: https://code.wireshark.org/review/15884
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
 
-commit 792c01a
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Dec 18 13:56:47 2014 -0800
+commit d74113f
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Tue Jun 14 17:38:17 2016 -0400
 
-    Bluetooth: Remove unused value strings.
+    Don't list "AVP" as a possible member of a grouped AVP.
     
-    Remove bluetooth_type_vals and bluetooth_direction_vals.
+    There's no AVP named "AVP".  And there's no need to tell Wireshark that any AVP
+    may put in the group (the RFC lists "AVP" for that purpose).
     
-    Change-Id: I2d39a59fc815f06d1a5cd5ab838e2bde37597469
-    Reviewed-on: https://code.wireshark.org/review/5842
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: I3591af725ebe089e13eae7b712ef4404cb7924a2
+    Reviewed-on: https://code.wireshark.org/review/15906
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit d3a4d92
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Thu Dec 18 21:16:16 2014 -0700
+commit 9bb4edf
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Apr 5 18:24:25 2016 +0200
 
-    Put a colon after the error message and before the field the error
-    is referring to for clarity.
+    packet.c: remove const compiler warning.
     
-    Change-Id: I7930e851647c847335b91435c7b0871c6db2defe
-    Reviewed-on: https://code.wireshark.org/review/5847
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
+    Change-Id: Ida9384dccb0e8bacbc9aad39515c3dae9c5ce563
+    Reviewed-on: https://code.wireshark.org/review/14768
+    Reviewed-by: João Valverde <j@v6e.pt>
+    Petri-Dish: João Valverde <j@v6e.pt>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 23987b4
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Thu Dec 18 20:49:50 2014 -0700
+commit 40a3cbf
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Tue Jun 14 11:31:10 2016 -0700
 
-    Add a comment to each of these scripts to say that
-    epan/dissectors/README.X11 has instructions for running them.
+    Qt: fix crash when opening Expert Info dialog
     
-    Change-Id: Id3c1df1bf1f50b19372b9a0470822da9ca6504f7
-    Reviewed-on: https://code.wireshark.org/review/5846
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
+    g6ff19ff tried to access cinfo by following a chain of pointers from
+    expert_info. Access cinfo from cap_file_, which is more reliable. While
+    we are at it, let's explicitly check the pointer validity.
+    
+    Change-Id: I0da72c5b1d2230a49c125a1b57c81c3115c4f2fb
+    Reviewed-on: https://code.wireshark.org/review/15901
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit b000ada
+commit c0c00f4
 Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Thu Dec 18 21:31:05 2014 -0500
+Date:   Tue Jun 14 10:52:28 2016 -0400
 
-    Finish renaming si_code to mtp3_si_code.
+    Give unique names to a bunch of reserved, experimental, etc., AVPs.
     
-    I5e183b997768c87f275569343afa69ca542aba46 missed a spot.
+    Also remove a bunch of AVPs that are unassigned/unallocated--there's no
+    real benefit to telling users that...
     
-    Change-Id: I0970f7e50719e71efc824bbb07a6c2a69c66e991
-    Reviewed-on: https://code.wireshark.org/review/5845
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Change-Id: I1b18a11a1b65189d21520c74aae3dde77688e592
+    Reviewed-on: https://code.wireshark.org/review/15895
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit acbef26
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Dec 17 21:59:56 2014 -0500
+commit 4ba1fe4
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Tue Jun 14 21:45:53 2016 +0200
 
-    Remove main-menubar-ui.xml because it's not used.
+    Replace wlan_ignore_wep_ by wlan_ignore_prot_ and WLAN_IGNORE_WEP_ by WLAN_IGNORE_PROT_
     
-    Noticed it because it had some really old menu information in it.  Much of which is now programmatically done.
+    Change-Id: I870cc1e5293dd6e1a1b71157987e27399e080a73
+    Reviewed-on: https://code.wireshark.org/review/15904
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
+
+commit 0d45698
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Mon May 2 17:21:57 2016 +0200
+
+    tvbparse: change g_hash_table to wmem_map.
     
-    Change-Id: I0a24227df48c00310bc3223f72ba71c00b2c9fc7
-    Reviewed-on: https://code.wireshark.org/review/5829
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Change-Id: I245595051617f6d6333314240825a526adf19339
+    Reviewed-on: https://code.wireshark.org/review/15244
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 07eef05
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Thu Dec 18 17:46:27 2014 -0700
+commit a7ab65d
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Apr 21 18:04:16 2016 +0200
 
-    Rename si_code variable to mtp3_si_code to avoid conflicts with NetBSD's
-    si_code #define in sys/siginfo.h
+    addr_resolv: change g_hash to wmem_map.
     
-    Change-Id: I5e183b997768c87f275569343afa69ca542aba46
-    Reviewed-on: https://code.wireshark.org/review/5844
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
+    Change-Id: Ice7533fbeac700dae0a46766838818a32b0d5736
+    Reviewed-on: https://code.wireshark.org/review/15051
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 577e6a1
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Dec 18 14:40:15 2014 -0500
+commit 1dabd3a
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Apr 12 18:14:14 2016 +0200
 
-    Allow "cba" filter prefix for hf_ fields.  Seems like something with "pn" or (abbreviated) Profinet would make more sense (with dissectors to match), but trying to satisfy pre-commit check.
+    dcm: remove g_malloc
     
-    Change-Id: I1db5314fdc77ab7b909c955415f66f24da7d2a0a
-    Reviewed-on: https://code.wireshark.org/review/5838
+    Change-Id: I3d00b710c6fc6e5798ecc5eca9af11ccac920e5a
+    Reviewed-on: https://code.wireshark.org/review/14913
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 71d13b3
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Thu Dec 18 11:53:03 2014 -0500
+commit 374d120
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Mon May 2 17:50:38 2016 +0200
 
-    proto.c: Add hint to 'DISSECTOR_ASSERT(hf->bitmask != 0)' to show field name.
+    tvbparse: change g_malloc to wmem_alloc.
     
-    Change-Id: Ie578a73742901c1837802da17c0aaf2e58d48c6f
-    Reviewed-on: https://code.wireshark.org/review/5835
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: I6a6363400d9fd1d76b9de0c5deea83dfc7cea1e2
+    Reviewed-on: https://code.wireshark.org/review/15245
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit f299f73
-Author: Maarten Bezemer <maarten.bezemer@gmail.com>
-Date:   Thu Dec 18 15:42:53 2014 +0100
+commit 76ed781
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Tue Jun 14 21:12:16 2016 +0200
 
-    Add new cmake.in files to the distribution
+    Add Aerohive gre tunnel between APs.
     
-    Change-Id: I685b9376342087182cc0dc8d9b8ed8e17a5ff8e7
-    Reviewed-on: https://code.wireshark.org/review/5833
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I24d0320cd164ead2802af37d07016c9c46d18e9e
+    Reviewed-on: https://code.wireshark.org/review/15903
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 
-commit e2d7b56
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Dec 18 12:33:03 2014 +0100
+commit e86af3a
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Sun Apr 3 11:10:02 2016 +0200
 
-    Add new cmake files to the distribution
+    wslua: remove FAIL_ON_NULL_MEMBER_OR_EXPIRED
     
-    Change-Id: Iae5ffac472c6d013cf5dd37310278f203a04f8d3
-    Reviewed-on: https://code.wireshark.org/review/5831
+    Ensure that the member cannot be NULL at initialization, simplifies
+    checkCaptureInfo and checkCaptureInfoConst logic.
+    
+    Change-Id: I2d9caa4a235310569ebbf0b30199dd3df7a4c093
+    Reviewed-on: https://code.wireshark.org/review/14791
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 361ea82
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Wed Dec 17 11:38:49 2014 +0100
+commit f6e223c
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Sun Apr 3 10:58:44 2016 +0200
 
-    Add support for multifields in custom column
-    
-    You can now add column with Custom type with more than one field
-    by using OR "||" splitter.
+    wslua: Drop unused "push_code" macro parameter
     
-    Bug: 9695
+    Reduce noise, no caller has used this parameter since its introduction.
+    Msotly automated regex search and replace.
     
-    Change-Id: Ia82a91e7a35b867647d36cb9626e3870f46c0d85
-    Reviewed-on: https://code.wireshark.org/review/5804
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: I4b1180bfee8544b38d19c9c440ff5b9b0dc080b2
+    Reviewed-on: https://code.wireshark.org/review/14790
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit f5cd215
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Fri Dec 12 11:24:44 2014 +0100
+commit cecb227
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Fri Jun 3 17:56:54 2016 +0200
 
-    Bluetooth: Add generic Bluetooth dissector
+    Add dissector for Real Time Location System (RTLS)
     
-    Bluetooth dissector is used to add ability to filter all bluetooth
-    payload from capture files (there are many transport like:
-    hci_h4, hci_h1, hci_usb, hci_mon, btle). Also it is used to placeholder for
-    all data tree used to store additional informations like bd_addrs, names, etc.
-    Finally it is used to be one point for Bluetooth
-    Endpoints/Conversation filtering what is enabled now.
-    
-    Also add Master/Slave Role and Connection Mode tracking.
-    
-    Change-Id: I67048080fb8ee16fa0f4ec429c1257de81ddd737
-    Reviewed-on: https://code.wireshark.org/review/5771
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: I494cbb8c3c6da18dfd7901d098dde6448226f67e
+    Reviewed-on: https://code.wireshark.org/review/15711
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 4a467ff
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Fri Dec 12 11:11:00 2014 +0100
+commit 4000386
+Author: Irene Ruengeler <ruengeler@wireshark.org>
+Date:   Mon Jun 13 17:39:42 2016 +0200
 
-    Bluetooth: BTLE: Add src/dst addresses when they are known
+    Fix SCTP analysis broken
     
-    Generally where it is not connection then on LinkLayer protocol level
-    addresses for Source and Destination device are known.
-    
-    Change-Id: Id67703edc08df73d4c7a2f66ee8f4d6810a867c9
-    Reviewed-on: https://code.wireshark.org/review/5776
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
+    Bug: 12513
+    Change-Id: I3fdf79106ed007aadf528f0b373fb7a487f3d9a9
+    Reviewed-on: https://code.wireshark.org/review/15870
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit ee4a7f2
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Tue Dec 9 18:55:44 2014 +0100
+commit 798f7e9
+Author: Balint Reczey <balint@balintreczey.hu>
+Date:   Tue Jun 23 13:51:32 2015 -0700
 
-    DisplayFilter: Check also another fields with the same name
+    gtk: Allow restoring maximized windows as maximized
     
-    This adds possibility to have two fields with the same abbrev name
-    but different type, for example FT_ETHER and FT_STRING.
-    That allows to compare each one to find a valid field.
+    without losing window decorations on GNOME on the secondary monitor.
     
-    Change-Id: I8b2a1708ac9648b7a4289777c72a0f3b18f3d8f8
-    Reviewed-on: https://code.wireshark.org/review/5702
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Bug: 11303
+    Change-Id: Ie8f541dba9d49f9fe5d4892a8dc1cd42091afe1d
+    Reviewed-on: https://code.wireshark.org/review/9077
+    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit a73b89b
-Author: Maarten Bezemer <maarten.bezemer@gmail.com>
-Date:   Wed Dec 17 15:03:56 2014 +0100
+commit f8031fa
+Author: Binh Trinh <beango@gmail.com>
+Date:   Tue Jun 14 00:37:53 2016 -0400
 
-    Use LocatePythonModule to locate asn2wrs.py
+    Added XML proper decoding for XML CDATASection
     
-    This reuses existing functionality and thereby making FindAsn2Wrs.cmake obsolete, resulting in a reduction of the cmake module maintaince load
-    
-    Change-Id: Ic6ae53e65236246c0cbe86f8c2f066a2d034e0b9
-    Reviewed-on: https://code.wireshark.org/review/5805
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Bug: 11755
+    Change-Id: Iecf7ce4bfad45d0c49f3af205e8489e53077198b
+    Reviewed-on: https://code.wireshark.org/review/15889
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit cb345eb
-Author: Maarten Bezemer <maarten.bezemer@gmail.com>
-Date:   Sun Nov 16 16:07:45 2014 +0100
+commit cbfa817
+Author: Anders Broman <a.broman58@gmail.com>
+Date:   Tue Jun 14 15:37:33 2016 +0000
 
-    Use LocatePythonModule to find make-dissector-reg.py in order to make UseMakeDissectorReg.cmake more generally (out-of-source) usable.
-    Add make-dissector-reg.py to the Debian packages.
+    Revert "Move inclusion of CmakeListsCustom to the end of the file in order to have all defines in place."
     
-    Making it possible to generate out-of-source wireshark plugins.
+    This reverts commit bcbcad1e597f89e64389b6cc25b2fdbe9f89d960.
     
-    Change-Id: I0bbe5b46205d39e229d31812341540b26a7336d6
-    Reviewed-on: https://code.wireshark.org/review/5802
+    This change breaks building of custom plugins.
+    
+    Change-Id: I63e88ceb922ca23ead9784705ad8ba088a504fd1
+    Reviewed-on: https://code.wireshark.org/review/15893
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 0885d29
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 17 20:03:47 2014 -0800
+commit 2f9957a
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Tue Jun 14 15:40:57 2016 +0200
 
-    Make sure err_info is always set, and print it iff it's non-null.
+    browser (dcerpc): Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
     
-    Change-Id: Ib5c600c491a3d8adcfa91c00fa9445283610545b
-    Reviewed-on: https://code.wireshark.org/review/5830
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I158a5fd8a645cd4d58565a6a4ee64371d271eb8e
+    Reviewed-on: https://code.wireshark.org/review/15892
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit 6011a04
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 17 16:41:21 2014 -0800
+commit af6936c
+Author: Balint Reczey <balint@balintreczey.hu>
+Date:   Mon Jun 13 20:01:08 2016 -0700
 
-    WTAP_ERR_UNWRITABLE_ errors aren't returned by reads or open-for-reading.
-    
-    Check for them *only* on opening for writing and writes.
+    GTK: Disable liboverlay-scrollbar that crashed wireshark on Ubuntu
     
-    Change-Id: I4b537d511ec04bcfc81f69166a2b9a2ee9310067
-    Reviewed-on: https://code.wireshark.org/review/5827
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Bug: 11400
+    Change-Id: I40d901ab3ef43a61ef984014dabc0547605ef77c
+    Reviewed-on: https://code.wireshark.org/review/15888
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit aa27e66
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 17 16:31:49 2014 -0800
+commit 048ba7a
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Mon Jun 13 15:50:33 2016 -0700
 
-    Rename WTAP_ERR_REC_TYPE_UNSUPPORTED to WTAP_ERR_UNWRITABLE_REC_TYPE.
+    mount: don't THROW() an exception from a dissector
     
-    That indicates that it's a problem specific to *writing* capture files;
-    we've already converted some errors to that style, and added a new one
-    in that style.
+    if the length is too large, we can simply skip nfs_name_snoop_add_name()
+    and the code to prepare its input
     
-    Change-Id: I8268316fd8b1a9e301bf09ae970b4b1fbcb35c9d
-    Reviewed-on: https://code.wireshark.org/review/5826
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I30c9a89edf7b48c45b52e7dad099ac4151f7f4a7
+    Reviewed-on: https://code.wireshark.org/review/15883
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 51522b3
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 17 16:02:50 2014 -0800
+commit 238a984
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Mon Jun 13 19:51:29 2016 -0400
 
-    Handle "I can't map this for that file format" better.
+    Don't register Wireshark for .pfx (IPFIX) files.
     
-    For cases where record (meta)data is something that can't be written out
-    in a particular file format, return WTAP_ERR_UNWRITABLE_REC_DATA along
-    with an err_info string.
+    (As pointed out by Gerald) .pfx files are (more commonly) PKCS#12 files.
+    People may be upset if we start grabbing them.
     
-    Report (and free) that err_info string in cases where
-    WTAP_ERR_UNWRITABLE_REC_DATA is returned.
-    
-    Clean up some other error reporting cases, and flag with an XXX some
-    cases where we aren't reporting errors at all, while we're at it.
-    
-    Change-Id: I91d02093af0d42c24ec4634c2c773b30f3d39ab3
-    Reviewed-on: https://code.wireshark.org/review/5823
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Iecf857d082b7f2a0ad4fdd1a932332fc3c9d9498
+    Reviewed-on: https://code.wireshark.org/review/15886
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 8ce0f12
-Author: Maarten Bezemer <maarten.bezemer@gmail.com>
-Date:   Wed Dec 17 11:06:19 2014 +0100
+commit da50994
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Mon Jun 13 20:14:41 2016 -0400
 
-    Resync Debian symbols
-    Fix wrong symbol for proto_tree_add_bitmask_with_flags
+    Adjust the Diameter DTD to accept applications and vendors in any order.
     
-    Change-Id: I6804aab8f4394653fbeb2b6343d20d43eaa2b93e
-    Reviewed-on: https://code.wireshark.org/review/5803
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I301a138b7f6db2d1a9ce1a20ebecf94e100bf831
+    Reviewed-on: https://code.wireshark.org/review/15887
+    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
 
-commit 1a56990
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Wed Dec 17 15:42:57 2014 +0000
+commit 4e13588
+Author: John A. Thacker <johnthacker@gmail.com>
+Date:   Mon Jun 13 16:36:07 2016 -0400
 
-    Fix zbee errors introduced by change 5565, commit df639f509e812fff3c5eb4bdf4f77988c6ec122b
+    extcap: Check libssh >= 0.6.0 for sshdump, ciscodump
     
-    Reworked zbee_mfr_code_names to be in monotonic order.
-    Fixed implicit shortening of time value with a cast.
+    sshdump and ciscodump require libssh >= 0.6.0. Check for this version and
+    only build them if a sufficient version is present. (The other checks
+    stay; in particular, ssh_userauth_agent doesn't exist on Windows and
+    must be checked separately.)
     
-    Change-Id: I629948fbe32543fd2672bbc40af790333b970b10
-    Reviewed-on: https://code.wireshark.org/review/5808
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Bug: 12507
+    Change-Id: Ibe42b0cbb597cd9c4aab51f44d48185940ad954b
+    Reviewed-on: https://code.wireshark.org/review/15882
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
+    Reviewed-by: Dario Lombardo <lomato@gmail.com>
+    Tested-by: Dario Lombardo <lomato@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit db4232a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 17 12:38:48 2014 -0800
+commit 4943082
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Mon Jun 13 19:28:04 2016 -0400
 
-    This code is used in Wireshark, not TShark; fix messages.
+    Fix Custom.xml so it can be (correctly) included into the main dictionary.
     
-    Change-Id: I3c6b7686de478e42eeeb9c51c8bdb5b6843666af
-    Reviewed-on: https://code.wireshark.org/review/5814
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    This file is included into dictionary.xml so it doesn't need all the DOCTYPE
+    stuff.
+    
+    Change-Id: I8397b3babe45c28706867be3169ce6ed566930e6
+    Reviewed-on: https://code.wireshark.org/review/15885
+    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
 
-commit e00f585
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 17 11:53:13 2014 -0800
+commit 90fa55d
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Mon Jun 13 05:35:14 2016 +0100
 
-    Fix another incorrect message for WTAP_ERR_UNSUPPORTED.
+    Add missing const to inet_ipv6.h
     
-    WTAP_ERR_FILE_UNKNOWN_FORMAT is reported if the file is in a format that
-    libwiretap doesn't know about (either because it's not a capture file at
-    all or because it's a capture file in a format it doesn't support).
-    WTAP_ERR_UNSUPPORTED is for files in a *known* format that are using
-    features or file format elements (record type, link-layer header type,
-    etc.) that libwireshark doesn't support.  Fix another copy-and-pasteo
-    causing WTAP_ERR_UNSUPPORTED to be reported with a message appropriate
-    for WTAP_ERR_FILE_UNKNOWN_FORMAT.
+    Make it simpler too.
     
-    Change-Id: Ib35e2a6b6c62517887e0386f0fed1795db335439
-    Reviewed-on: https://code.wireshark.org/review/5810
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 97cc005
-Author: zeuz <czingerl@gmail.com>
-Date:   Tue Dec 16 19:23:55 2014 +0100
-
-    Artnet3 and OEM Codes Update
-     - Improved handling of status bits
-     - Using bitfields where applicable
-     - Unified capitalization of hex values
-     - Using TFS instead of bits for status flags
-     - Added universe ID calculation from Address/Net/Port
-     - Added RDM PID decoding (values in packet-rdm.c)
-     - Added Poll/PollReply/Toc/Rdm support for Artnet3 (15bit universe)
-     - Updated manufacturer list from ESTA website
-     - Updated OEM codes from Art-Net SDK
-    
-    Change-Id: I33edbfa754cb37391614f7cf4d6d4a9b11bcd52d
-    Reviewed-on: https://code.wireshark.org/review/5755
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I97dc79d7ac536089c1fa6ec2c20f19754d47a9d4
+    Reviewed-on: https://code.wireshark.org/review/15866
+    Petri-Dish: João Valverde <j@v6e.pt>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: João Valverde <j@v6e.pt>
 
-commit 2018404
-Author: zeuz <czingerl@gmail.com>
-Date:   Tue Dec 16 19:08:53 2014 +0100
+commit 72af485
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sat Jun 11 13:56:33 2016 +0200
 
-    RDM: Made PID array global (can be reused in packet-artnet.c)
-    Fixed deprecated API warning
+    dcerpc: don't THROW() an exception from a dissector
     
-    Change-Id: I761181baf9f5ae31a8a3807eb27d791d8868dcde
-    Reviewed-on: https://code.wireshark.org/review/5786
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2d6adb2
-Author: Evan Huus <eapache@gmail.com>
-Date:   Wed Dec 17 13:00:25 2014 -0500
-
-    zbee-zcl: swap honeywell codes
+    remove the checks in dissect_ndr_ucarray_core() where a block or bytes
+    dissection function is called and an exception is thrown if the offset
+    wraps around, i.e. the final offset is lower than the initial one
     
-    they were out of order for the extended value-string, I suspect honeywell1 and
-    honeywell2 had just been put in backwards
+    the block functions eventually call proto_tree_add_item(), which throws
+    an exception if necessary
     
-    Change-Id: I4aacf27ba8aa20c137731f1ad652380cd5af5562
-    Reviewed-on: https://code.wireshark.org/review/5809
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit 24965c6
-Author: Maarten Bezemer <maarten.bezemer@gmail.com>
-Date:   Wed Dec 17 16:25:17 2014 +0100
-
-    Fix missing space
+    the bytes functions end up calling functions to dissect basic types.
+    insert calls to tvb_ensure_bytes_exist() if those functions increase our
+    offset without reading data.  thus, an exception is thrown if there's an
+    overflow.
     
-    Change-Id: Ia56ff1d78d584ca062a714aac097c05034279e34
-    Reviewed-on: https://code.wireshark.org/review/5807
+    remove some unnecessary if (tree) checks while at it
+    
+    Change-Id: I8006399ae20934daeec231246debe247f8dedbf0
+    Reviewed-on: https://code.wireshark.org/review/15832
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit e4b4647
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Dec 17 16:24:40 2014 +0100
+commit 551b824
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Mon Jun 13 15:34:16 2016 -0400
 
-    [MIP] Add refreence to 3GPP2 documents for 3GPP2 CVSE GRE_KEY_EXT
+    Add proto_tree_add_bitmask_list_value.
+    
+    Ran across enough situations that proto_tree_add_bitmask_list couldn't
+    solve that it seemed necessary.
     
-    Change-Id: I24d77e3602afba4c522648a3fabd7672c7c1f736
-    Reviewed-on: https://code.wireshark.org/review/5806
+    Change-Id: I6a540ac6efca76cae7c4571a84bb400538652784
+    Reviewed-on: https://code.wireshark.org/review/15880
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit a13bbfc
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Mon Dec 15 15:00:04 2014 +0100
+commit 720b47f
+Author: Andreas Leibold <andreas.leibold@harman.com>
+Date:   Fri Jun 10 10:41:19 2016 +0200
 
-    [TCP] Don't attempt reassembly on retransmitted segments.
+    Updates on AVB IEEE 1722 protocol to support more 1722 subtypes.
     
-    Change-Id: I140227416435589a8b83ccb440625ccb90d0673e
-    Reviewed-on: https://code.wireshark.org/review/5772
+    packet-ieee1722.c now contains the entire protocol.
+    packet-ieee1722a.c file was removed, because the term 1722a is outdated
+    and now part of 1722 protocol.
+    
+    Change-Id: Ic2f44a2752f9254cde62d878dc971f09cddc5adc
+    Reviewed-on: https://code.wireshark.org/review/15810
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 6b7a395
-Author: Ganesh Nawsupe <ganesh991@gmail.com>
-Date:   Fri Dec 12 11:50:21 2014 +0530
+commit 858dc0c
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Jun 12 16:31:57 2016 -0700
 
-    Adding fix to convert latitude/longitude degrees to floating point format from fixed point format
+    use #include <file.h> for generated include files
+    
+    the same mechanism as described in
+    7c40de5c38ac71323455c51dcc14a5eb385ce718
+    could trick us into using the wrong config.h
+    
+    fix this for some occassions where config.h is included before we
+    include zlib.h
+    
+    I saw compile errors on windows where we picked up config.h from a linux
+    build and zlib failed because of a mission unistd.h
     
-    Change-Id: Ibcfeae69e4f60423c87a0fdb8666192a1ca5dc0c
-    Reviewed-on: https://code.wireshark.org/review/5726
+    Change-Id: I91cf73b96c9e1b6f009fb2376fabfe973d1ac941
+    Reviewed-on: https://code.wireshark.org/review/15874
     Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit a3510cc
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Dec 16 18:02:33 2014 -0500
+commit dda2acc
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Jun 12 14:00:21 2016 -0700
 
-    mip: Fix Rev Revocation [Ack] Flags dissection bugs.
+    qt: use #include <file.h> for generated include files
+    
+    make sure that generated include files are picked up only from the
+    directories set by -I (or /I), not from the current directory
+    
+    if we use #include "file.h", Visual Studio searches for file.h in the
+    same diretory as the source file that includes file.h
+    
+    if we do an out-of-tree build with cmake and the source directory
+    contains files from an in-tree build (done with autotools), we might end
+    up including the wrong file
     
-    Change-Id: Ia1eb397ee6aba8211b1091636e4ac4f51c95cc2b
-    Reviewed-on: https://code.wireshark.org/review/5791
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: Iaaed2626258b6ff0c12485fe3f436bd03bbb5adf
+    Reviewed-on: https://code.wireshark.org/review/15873
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 8ccdc07
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Thu Dec 11 16:56:22 2014 -0500
+commit 4ca4768
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sat Jun 11 23:15:01 2016 +0100
 
-    mip: fix (what appear to be) bugs in CVSE GRE key extension dissection
+    IPv6: Add text marker for SRH next segment
     
-    Change-Id: I43dc48de62eda3a62bef4bf4a40fd18cb45751f3
-    Reviewed-on: https://code.wireshark.org/review/5733
+    Change-Id: If13ffe4ddb9ae08e738ccf0c715dc12ce7a076e8
+    Reviewed-on: https://code.wireshark.org/review/15834
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit d99fe21
-Author: AndersBroman <a.broman@bredband.net>
-Date:   Tue Dec 16 23:46:59 2014 +0100
+commit 4dad151
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Mon Jun 13 11:36:10 2016 -0700
 
-    Update to V12.5.0
+    sip: remove some unnecessary if (tree) checks
     
-    Bug: 10782
+    which shouldn't have any impact on performance
     
-    Change-Id: I5fd4ec14279411682d8a23f5e0f503180113f093
-    Reviewed-on: https://code.wireshark.org/review/5790
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit df639f5
-Author: Chris Brandson <chris.brandson@gmail.com>
-Date:   Fri Nov 7 14:11:02 2014 -0800
-
-    Fixed bug in ZigBee (zbee) decryption, added Key Establishment cluster and moved IAS, Thermostat and Poll clusters out of the ZCL foundation dissector.
-    
-    Removed attrID and cmdID ZCL cluster functions.
-    Bug in ZCL HVAC attribute registration.
-    Fixed bug in ZCL command ID field registration.
-    Update Manufacturer Codes and Profile Ids to ZigBee-053874r26 Oct 2014
-    Fixed broken fragmented ZigBee packet collection and reassembly
-    Use protocol fields for Thermostat schedule transitions.
-    Added support for Key Establishment Cluster (CBKE) at SE 1.2a
-    Updated Message cluster to SE 1.2a spec
-    Added attribute reporting status which is common to all SE 1.2a clusters
-    Added SE 1.2a tunnel cluster support
-    ZigBee Smart Energy (SE) decryption appears to have been broken for some time. For SE you do not know the Link Key until after successful completion of Key Establishment and then manually enter it into preferences. Entry in preferences was broken such that when the new Link Key was entered all existing link keys would be lost. This lead to the loss of the Network Key as well when the Transport Key message was re-processed without the Pre-Configured Link Key. The Link Key 'key ring' has been moved to the UAT post-update callback so that it will always be updated correctly after changes to the link keys in preferences
-    The attribute reporting status attribute which is common to all SE clusters was accidentally shared, now each cluster has it's own instance
-    ZigBee security added key display for decrypted packets
-    ZigBee Security Preferences fixed UAT type for Label so key label is editable again
-    Added definition for Retail Service profile
-    Added dissection for profile-wide (General Command Frame) commands when the profile is unknown
-    Added zbee-zcl-misc.c to precommit check whitelist as it contains ias and hvac clusters avoiding proliferation of too many small files
-    
-    Change-Id: I53d85ba9d782db6a0e7e78c51b0bc7cdcdbca3ad
-    Reviewed-on: https://code.wireshark.org/review/5565
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    we should not remove the chcks around blocks where
+    vb_format_text() is called
+    
+    Change-Id: Idc191cc70e7458225bbc5dfececb3c88c83ab5f1
+    Reviewed-on: https://code.wireshark.org/review/15879
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit c5b7207
-Author: Maarten Bezemer <maarten.bezemer@gmail.com>
-Date:   Wed Nov 12 13:43:14 2014 +0100
+commit bcbcad1
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Mon Jun 13 20:51:48 2016 +0200
 
-    Install cmake files to make them available for out of source builds
+    Move inclusion of CmakeListsCustom to the end of the file in order to have
+    all defines in place.
     
-    Change-Id: I2cb4018f0214b6c0bdccfd1e83c7a7f22a818e8b
-    Reviewed-on: https://code.wireshark.org/review/5256
+    Change-Id: I190257e9b833c409921bbca74c8ab531b632c60d
+    Reviewed-on: https://code.wireshark.org/review/15878
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit cc8ed84
-Author: Maarten Bezemer <maarten.bezemer@gmail.com>
-Date:   Wed Nov 12 13:39:07 2014 +0100
+commit 3fe879b
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Mon Jun 13 09:30:30 2016 -0700
 
-    Invoke asn2wrs.py using a custom command
+    isns: fix dead code
     
-    A custom target is defined to be always invalid, so asn2wrs.py is always invoked.
-    A custom command is able to convert input file(s) into output file(s), the actual command is only invoked in the provided dependencies are changed.
-    As an advantage the dependencies are correct, so cmake is able to determine when the output file is required, so it can be build in time.
+    do the special handling for len==0 and tag==ISNS_ATTR_TAG_PORTAL_GROUP_TAG
+    before going into the different attributes
     
-    Change-Id: I84be5d408cfc87cf88d67b6073bea439febbe712
-    Reviewed-on: https://code.wireshark.org/review/5255
+    Bug: 12503
+    Change-Id: I4dd6dcea25aba2e4963811a7a85f1eed1b906bcd
+    Reviewed-on: https://code.wireshark.org/review/15875
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit a1d4c0a
-Author: Maarten Bezemer <maarten.bezemer@gmail.com>
-Date:   Wed Nov 12 13:32:41 2014 +0100
+commit 30d1afb
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue May 3 16:51:45 2016 +0200
 
-    Do not force the output directory
-    
-    For out of source builds, the output directory should not point to wireshark source locations.
-    By default it does point to the wireshark source directory (to stay compatible with the build in dissectors).
-    When the A2W_OUTPUT_DIR variable is set to "_EMPTY_" the output lcoation argument (-O) is not invoked.
-    Use A2W_FLAGS to set an output location for out of source builds (or use A2W_OUTPUT_DIR, which has the same result)
+    tvbparse: change g_strdup_printf to wmem_strdup_printf.
     
-    Change-Id: I48b7486fcda982f0dce57cde3beacb99f946abd9
-    Reviewed-on: https://code.wireshark.org/review/5254
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I57ff604d23967eb1f6481c7019e3eab0389dc3a5
+    Reviewed-on: https://code.wireshark.org/review/15257
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Reviewed-by: Dario Lombardo <lomato@gmail.com>
 
-commit fb01f59
-Author: Maarten Bezemer <maarten.bezemer@gmail.com>
-Date:   Tue Nov 11 17:11:11 2014 +0100
+commit 34cacfc
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Jun 13 11:17:48 2016 -0700
 
-    Use FindAsn2Wrs to find asn2wrs.py
+    Qt: Fix a Windows version check.
     
-    A first step to make it possible to reuse the UseAsn2Wrs for out of source builds.
+    Fetch the version using QSysInfo::windowsVersion.
     
-    Change-Id: Iefb34f943e06db3d6afed55ab69d3f26aa9d633d
-    Reviewed-on: https://code.wireshark.org/review/5253
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Ping-Bug: 12010
+    Change-Id: If63c576ec4f56f34b76f320cdd927bee427c8cb7
+    Reviewed-on: https://code.wireshark.org/review/15876
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit c083f50
-Author: Maarten Bezemer <maarten.bezemer@gmail.com>
-Date:   Wed Nov 12 13:02:17 2014 +0100
+commit b8201ae
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Jun 12 16:07:30 2016 -0700
 
-    Install GLib cmake helper files
+    Qt: Main window tab behavior.
     
-    GLib is always/mostly required when building wireshark plugins. These cmake fiels help finding the install glib components
+    Make the main window tab order more closely match the GTK+ UI. Draw a
+    focus rect in the byte view text while we're here.
     
-    Change-Id: Ie59b50bf8c53c367d4bf89f53db5ae31e97e0575
-    Reviewed-on: https://code.wireshark.org/review/5252
+    Change-Id: I04212c14ea7f0d6865b709533246760adc02f45a
+    Reviewed-on: https://code.wireshark.org/review/15862
     Petri-Dish: Anders Broman <a.broman58@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit d2eddde
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 17 00:47:31 2014 -0800
+commit 1dcaeb3
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Mon Jun 13 14:29:22 2016 -0400
 
-    Report WTAP_ERR_UNSUPPORTED correctly.
+    Cisco Diameter: move the XML declaration to the top of the file.
     
-    WTAP_ERR_FILE_UNKNOWN_FORMAT is reported if the file is in a format that
-    libwiretap doesn't know about (either because it's not a capture file at
-    all or because it's a capture file in a format it doesn't support).
-    WTAP_ERR_UNSUPPORTED is for files in a *known* format that are using
-    features or file format elements (record type, link-layer header type,
-    etc.) that libwireshark doesn't support.  Fix some copy-and-pasteos
-    causing WTAP_ERR_UNSUPPORTED to be reported with a message appropriate
-    for WTAP_ERR_FILE_UNKNOWN_FORMAT.
+    ... That's where it's supposed to be.
     
-    Change-Id: Ic675ffd501c52838d8944a6c61e1b01041b73098
-    Reviewed-on: https://code.wireshark.org/review/5799
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I0ec68dc8757776bf757b52e75bc156acc7264ee5
+    Reviewed-on: https://code.wireshark.org/review/15877
+    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
 
-commit ddcc2ae
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 17 00:29:31 2014 -0800
+commit d06cac6
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Mon Jun 13 13:52:19 2016 -0400
 
-    Rename WTAP_ERR_UNSUPPORTED_FILE_TYPE to WTAP_ERR_UNWRITABLE_FILE_TYPE.
+    Diameter (NSN): the attribute name is 'mandatory' not 'mandatory-flag'.
     
-    That makes it clearer what the problem is, and that it should only be
-    returned by the dump code path, not by the read code path.
-    
-    Change-Id: I22d407efe3ae9fba7aa25f08f050317549866442
-    Reviewed-on: https://code.wireshark.org/review/5798
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ifa19b59e23278abf332d8ab06dd5ad2059f3e679
+    Reviewed-on: https://code.wireshark.org/review/15872
+    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
 
-commit dbdcae8
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Dec 16 22:40:45 2014 -0800
+commit 4e989c2
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Mon Jun 13 13:37:08 2016 -0400
 
-    Rename WTAP_ERR_UNSUPPORTED_ENCAP to WTAP_ERR_UNWRITABLE_ENCAP.
+    Diameter: close command elements.
     
-    That makes it clearer what the problem is, and that it should only be
-    returned by the dump code path, not by the read code path.
+    ... in order to make the XML (more) valid.
     
-    Change-Id: Icc5c9cff43be6c073f0467607555fa7138c5d074
-    Reviewed-on: https://code.wireshark.org/review/5797
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Iefffff3208c98d6ea55d509ed35b57abd268baf3
+    Reviewed-on: https://code.wireshark.org/review/15871
+    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
 
-commit 40f69b2
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Dec 16 22:22:29 2014 -0800
+commit 04b82a7
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sun Jun 12 12:28:02 2016 -0400
 
-    Use WTAP_ERR_UNSUPPORTED for input file stuff we can't handle.
+    Convert AT_SS7PC to a "dissector address type"
     
-    WTAP_ERR_UNSUPPORTED_ENCAP means "I can't *write* that particular
-    encapsulation type to a file of this format", which mainly means "that
-    file format simply can't handle packets of that type";
-    WTAP_ERR_UNSUPPORTED means "this file can't currently be supported by
-    Wireshark, as there's some feature in the file - such as a file or
-    per-packet encapsulation type - that we don't (yet) handle".
+    The formatting of the address type is determined by a preference in
+    packet-mtp3.c, so just make MTP3 register the address type.
+    Use address_type_get_by_name in other dissectors (and export_pdu)
+    to use the address type.
     
-    Change-Id: I53cadf9913d20efb2bccb29f61877b71d53807be
-    Reviewed-on: https://code.wireshark.org/review/5794
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ifb32d7de27aeaa23cee8e803e25ffb3c905547b5
+    Reviewed-on: https://code.wireshark.org/review/15856
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit b56d4d0
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Dec 16 22:08:03 2014 -0800
+commit e2e8456
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Mar 18 13:13:44 2016 -0700
 
-    Clean up the "unknown per-packet encapsulation" message.
+    Use getc_unlocked in a few places.
     
-    Report the file name, report the frame number as unsigned (which it is),
-    and make it look more like other error messages.
+    Use getc_unlocked or _fgetc_nolock instead of getc in a few places. This
+    reduces startup time by about 100ms here.
     
-    Change-Id: Ia5281da1c94d55c745da8a8b20dafdb74dd13f92
-    Reviewed-on: https://code.wireshark.org/review/5793
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I59ceb09678457c871cce79fcc3ce71998fe4f5af
+    Reviewed-on: https://code.wireshark.org/review/14518
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 625ba02
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Dec 16 21:29:41 2014 -0800
+commit 92ef3d0
+Author: Anton Thomasson <anton.thomasson@ericsson.com>
+Date:   Fri Jun 10 16:12:24 2016 +0200
 
-    Clean up handling of files without a known encapsulation.
-    
-    Fail with an "unsupported encapsulation" error for MTP2 and SSCOP,
-    rather than just returning "unknown encapsulation", and fail with that
-    if the encapsulation isn't filled in as well, although that might be a
-    deeper problem.
+    GSM RLC/MAC: add dissection of EC-GSM-IoT control messages
     
-    (Not that people should be handing text output files from K12 analyzers
-    anyway - they should hand us RF5 files and, if we can't handle their
-    file, file a bug and give us the file so we can further reverse-engineer
-    the format.)
-    
-    Change-Id: I6bbd5f81787d69bd3b41eaedf2893d179f11ad6a
-    Reviewed-on: https://code.wireshark.org/review/5792
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ib7096039aa9761fda96ed8552899833597ba70a6
+    Reviewed-on: https://code.wireshark.org/review/15812
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit ad299df
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Dec 16 22:42:48 2014 +0100
+commit 4679f5d
+Author: Anton Thomasson <anton.thomasson@ericsson.com>
+Date:   Fri Jun 10 16:13:44 2016 +0200
 
-    HiSLIP: disable heuristic dissector by default
+    GSM RR: add dissection of EC-GSM-IoT ccch control messages
     
-    It is too weak (just checking that the 2 first bytes of TCP segment are "HS") to be always activated
-    
-    Change-Id: Iffda96046cc687004f403dd4d8e735375790b07b
-    Reviewed-on: https://code.wireshark.org/review/5789
+    Change-Id: Ib40f78a0d1822bf216af0911f9672c750a78b265
+    Reviewed-on: https://code.wireshark.org/review/15813
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit f400252
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Dec 16 11:03:46 2014 -0800
+commit c016dcd
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Sun Jun 12 19:00:37 2016 -0400
 
-    Disable the MDS Header ethertype preference.
+    Diameter: free the diameter directory variable.
     
-    If you encounter a frame with an all-zeroes ethertype it's very likely
-    due to buggy hardware or software. Don't try to dissect it as MDS
-    Header traffic.
+    It's only needed for a few milliseconds--there's no need for it to stick around
+    until the epan scope ends.
     
-    Change-Id: Ie08d6aba2dcb82e4e49d6dbe96a2a3639e3cafc4
-    Bug: 8256
-    Reviewed-on: https://code.wireshark.org/review/5788
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    As discussed on I51813815babb4c40722c38459139ab9e3e3ccb42.
+    
+    Change-Id: I81fef351ef2d700cc5ec5866340605704173fbdb
+    Reviewed-on: https://code.wireshark.org/review/15861
+    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 972d347
-Author: Maarten Bezemer <maarten.bezemer@gmail.com>
-Date:   Wed Nov 12 12:56:26 2014 +0100
+commit 8b6ea37
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Jun 12 15:10:02 2016 -0700
 
-    Add Wireshark_LIBRARY variable
+    Qt: Make the capture filter read-only only in main welcome.
     
-    This variable can be used to obtain the wireshark library(ies) (from the correct location).
+    As noted in gb7897dd, CaptureFilterCombo needs to be read-only until the
+    app is initialized. Move the code to do so to MainWelcome, otherwise the
+    capture filter entry in CaptureInterfacesDialog starts out read-only and
+    stays that way. Disable / enable the entire CaptureFilterCombo instead
+    of setting its lineEdit read-only status, which provides a stronger
+    visual indicator.
     
-    Change-Id: I90cd5b098eb746ac573a2c611113287b06c3b82b
-    Reviewed-on: https://code.wireshark.org/review/5251
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Change-Id: Ic7bf5b5631b861ecf4dc8cca67beb5bf4ed27510
+    Reviewed-on: https://code.wireshark.org/review/15859
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 6ee78f3
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Nov 28 15:52:07 2014 +0100
+commit 6ff19ff
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jun 10 09:57:17 2016 -0700
 
-    http: properly calculate end of chunked response
+    Qt: Add the Info column contents to Expert Info.
     
-    It was previously assumed that the remainder of a packet contains a
-    chunked-body response. This does not have be the case, and if the
-    assumption is violated, then the dissector would add multiple parts to a
-    single "De-chunked entity body".
+    When "group by summary" is enabled, packet items contain a packet number
+    followed by a lot of empty space. Fill it with the contents of the Info
+    column.
     
-    This patch properly calculates the end of a chunked-body response,
-    taking the optional trailer-part into account and adjusting the size of
-    the chunked-body data as needed.
+    Set the first column title to "Severity" or "Packet" depending on the
+    item selection.
     
-    The CRLF in last-chunk that was previously dissected as "Chunk Boundary"
-    is the last CRLF that closes chunked-body, it is not part of last-chunk
-    (as it has no chunk-data to terminate).
+    Change-Id: Iff96ab2ec631300ec8f08e55019e191e88cff84a
+    Reviewed-on: https://code.wireshark.org/review/15814
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 88f4374
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Wed Apr 27 15:07:03 2016 +0100
+
+    Indent register.c and other cosmetic changes
     
-    A new header field is added for this trailer-part (RFC 7230 sec. 4.1).
+    Change-Id: I06e863e0b87118047f4c3b7618df02b9c7384a34
+    Reviewed-on: https://code.wireshark.org/review/15836
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 20961a1
+Author: Binh Trinh <beango@gmail.com>
+Date:   Sun Jun 12 14:21:12 2016 -0400
+
+    Added Diameter 3GPP decoding of AVP 1404 - QoS-Subscribed
+    (removed spaces)
+    (removed C++ style comments)
     
-    Bug: 10707
-    Change-Id: Ifef1cc7dd0443edca4198eb1c27f58719f85fa9f
-    Reviewed-on: https://code.wireshark.org/review/5526
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Petri-Dish: Evan Huus <eapache@gmail.com>
+    Change-Id: I0f6c7586486b48eab8659a048be451ce3fe1c72b
+    Reviewed-on: https://code.wireshark.org/review/15850
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit db93414
-Author: zeuz <czingerl@gmail.com>
-Date:   Tue Dec 16 15:34:29 2014 +0100
+commit 8ec8f6b
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Mon Jun 13 10:00:28 2016 +0200
 
-    RDM: Mode verbose decoding of parameter IDs.
-        -> I don't see why they were uint8; ANSI E1.33 and ANSI E1.20 use uint16
+    Qt: Multi line import from hex dump without offsets
     
-    Change-Id: Ia2c024b503d6a4b8c18020699bdc676a8459dcbd
-    Reviewed-on: https://code.wireshark.org/review/5783
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Fix importing hex dump without offsets with multiple lines.
+    
+    Change-Id: I7a7339e375b3125688f5b5d29f493704c7b9944a
+    Reviewed-on: https://code.wireshark.org/review/15868
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 1cbf951
+commit 4e55a28
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Dec 14 19:59:38 2014 +0100
+Date:   Sat Jun 11 06:14:35 2016 +0200
 
-    HTTP2: Update to draft-16
+    RADIUS: Add Sangoma dictionary
+    
+    From FreeRADIUS master
     
-    Also update HTTP Header Compression (to draft-10)
+    commit ba4b4402588ae87497a0b7c87e26eb5cb433c8a7
+    Author: Alan T. DeKok <aland@freeradius.org>
+    Date:   Fri Jun 10 14:38:55 2016 -0400
+    
+        Added dictionary.sangoma
     
-    No framing change on HTTP2 draft-16
+        from http://wiki.sangoma.com/files/NSC-Radius-Support/dictionary.sangoma.txt
     
-    Change-Id: I7f8ffd7ab37bc22fd6fbe156b0bf52543025e3a8
-    Reviewed-on: https://code.wireshark.org/review/5782
+    Change-Id: Ie51ea6343a2a8a5b286d70451abce81ca920261f
+    Reviewed-on: https://code.wireshark.org/review/15823
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit ce68707
-Author: Maarten Bezemer <maarten.bezemer@gmail.com>
-Date:   Tue Nov 11 14:41:01 2014 +0100
+commit 87b5597
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sun Jun 12 11:12:15 2016 -0400
 
-    Add cmake helper files for finding wireshark
+    Add address_type_get_by_name
     
-    These files make it possible to use the cmake command find_package(Wirehark) to obtain information about the wireshark installation.
+    This allows the decoupling of a dissector registering an address type
+    so it doesn't need to export the returned registered type.
     
-    Change-Id: I5af7c4e7b53b99cd473e04905a92bac267cd9b83
-    Reviewed-on: https://code.wireshark.org/review/5235
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I49c913d042e70bd4b7ea1e964ba9511bb27304f5
+    Reviewed-on: https://code.wireshark.org/review/15855
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit ec28d87
-Author: Marc Fournier <marc.fournier@camptocamp.com>
-Date:   Tue Dec 16 07:13:45 2014 +0100
-
-    Riemann: attach metric_d field to parent event
-    
-    Bug: 10781
-    Change-Id: I93ad2704f200afb303f3638fe0af65693d4c8f52
-    Reviewed-on: https://code.wireshark.org/review/5781
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 8d1a555
-Author: Yann Lejeune <ylejeune@netyl.org>
-Date:   Sat Dec 13 01:01:33 2014 +0100
+commit 0baf13f
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sun Jun 12 09:38:55 2016 -0400
 
-    ISIS LSP: Add Segment Routing Algorithm Sub TLV dissection
+    Completely remove dissector_add_handle.
     
-    This commit implements a part of draft-ietf-isis-segment-routing-extensions:
-     - 3.2. SR-Algorithm Sub-TLV
+    It has been deprecated and replaced with dissector_add_for_decode_as.
     
-    Change-Id: Ibb419de234bf5a199f8067989b1321064fa93983
-    Ping-Bug: 10520
-    Reviewed-on: https://code.wireshark.org/review/5742
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I5a4976f83951f749e70b5267570fca188daa7a07
+    Reviewed-on: https://code.wireshark.org/review/15854
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 84c6c74
-Author: Yann Lejeune <ylejeune@netyl.org>
-Date:   Fri Dec 12 22:32:50 2014 +0100
+commit 6ff6357
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sun Jun 12 14:50:04 2016 -0700
 
-    ISIS LSP: Add Segment Routing Capabilities Sub-TLV dissection
-    
-    This commit implements a part of draft-ietf-isis-segment-routing-extensions:
-     - 3.1 Routing Capabilities Sub-TLV
-     - 2.3 SID/Label Sub-TLV
+    USB: fix dissection of URB setup when the payload was claimed by a sub dissector
     
-    Change-Id: I3ee5e6d949cc6add412da761ffc55ef3101ddb97
-    Ping-Bug: 10520
-    Reviewed-on: https://code.wireshark.org/review/5739
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Bug: 12511
+    Change-Id: Ic9af8358e2a8110f53c587201cafc337630c302a
+    Reviewed-on: https://code.wireshark.org/review/15858
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit e709a34
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Dec 13 19:50:06 2014 +0100
+commit fef202b
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sun Jun 12 14:49:04 2016 -0700
 
-    exit if the key wasn't found in the parameters list
+    USB HID: add dissector to USB Device 'Decode As' list
     
-    Bug: 10761
-    Change-Id: I072cd3a68d852cb8dc57b9b9f807f792caba7259
-    Reviewed-on: https://code.wireshark.org/review/5750
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    Ping-Bug: 12511
+    Change-Id: I6193e3bb084adf9925bb6800a756804164030630
+    Reviewed-on: https://code.wireshark.org/review/15857
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 9187456
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Dec 15 19:09:57 2014 +0100
+commit db8dd0f
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Mon Jun 13 03:49:37 2016 +0100
 
-    MP4: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang > 3.3
+    Rename a variable
     
-    Change-Id: I0befc8846b9af43e1563adb369ba4d332775ef76
-    Reviewed-on: https://code.wireshark.org/review/5778
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    Change-Id: Ie5d859e166fbc8073be88cbbd96bffa877e6b654
+    Reviewed-on: https://code.wireshark.org/review/15865
+    Reviewed-by: João Valverde <j@v6e.pt>
 
-commit 82e6304
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Dec 15 19:12:24 2014 +0100
+commit 3f0c709
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jun 12 19:15:40 2016 -0700
 
-    MP4: fix Unused entry: epan/dissectors/file-mp4.c, hf_mp4_stsd_entry_cnt
+    Finish moving the parenthesis.
     
-    Change-Id: I95f0ab387570c0c56e19990cb9b9063051bb792f
-    Reviewed-on: https://code.wireshark.org/review/5779
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+    Change-Id: I02f099ef198e360663b03857bdf9538bb63a7de8
+    Reviewed-on: https://code.wireshark.org/review/15864
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit fafa686
-Author: Evan Huus <eapache@gmail.com>
-Date:   Tue Dec 9 21:35:01 2014 -0500
+commit 49db728
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jun 12 18:45:45 2016 -0700
 
-    Enable case-insensitive string dissector tables
-    
-    Permit passing TRUE as the parameter during table registration to achieve that
-    effect.
+    Fix a compile error.
     
-    Use it in RTP media type table.
+    (Perhaps the Petri dish buildbots should, if a build fails, immediately
+    mark the change as failing the Petri dish build, without waiting for the
+    other build(s), so that you don't have to, for example, wait for the
+    Ubuntu buildbot to finish doing a test build for a change that doesn't
+    affect code built on UN*X.)
     
-    Bug: 10708
-    Change-Id: I892fb1a421d349f0c05197dec90f14fc34ad6b97
-    Reviewed-on: https://code.wireshark.org/review/5695
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Petri-Dish: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I89ee1616d35c186fcabc0ec989936fa94116df70
+    Reviewed-on: https://code.wireshark.org/review/15863
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 27095f9
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Dec 15 09:24:01 2014 -0800
+commit 010e55c
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jun 12 15:30:35 2016 -0700
 
-    Add Bug 10488 (multiple capture files) to the release notes.
+    Don't assume we can get a module handle for kernel32.dll.
     
-    Change-Id: I405b2ecd3cbf33cbf882430686e29d2c8723e2b5
-    Reviewed-on: https://code.wireshark.org/review/5777
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    A failure "shouldn't happen", but check anyway; if nothing else, that
+    squelches some complaining from the VS Code Analysis tool.
+    
+    Change-Id: I9b06db399741176d0e9f859eb650bed8a2f96d9c
+    Reviewed-on: https://code.wireshark.org/review/15860
+    Petri-Dish: Guy Harris <guy@alum.mit.edu>
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit c504772
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Dec 15 16:26:31 2014 +0000
+commit d72b29c
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Sun Jun 5 21:06:51 2016 +0200
 
-    Revert "Bluetooth: BTLE: Add src/dst addresses when they are known"
+    Qt: Add import from hex dump without offsets
     
-    This reverts commit a89c17fb52ec1270076abd82e6e5cd56d94fa682.
+    Added support for importing from hex dump without offsets.
+    This will create one packet with all hex values found in the file.
     
-    Change-Id: I99029d72b82aaec1b398dffee0beec30829a3939
-    Reviewed-on: https://code.wireshark.org/review/5775
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I0414441721078befeb59aa6a87b9412646cfcf5c
+    Reviewed-on: https://code.wireshark.org/review/15743
+    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit dab9f76
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Mon Dec 15 15:45:20 2014 +0100
+commit 0acc76a
+Author: Léo Gaspard <leo@gaspard.io>
+Date:   Sun Jun 12 22:35:16 2016 +0200
 
-    [ISUP] Add dissection of Japan TTC EMERGENCY CALL INDICATOR
+    Fix typo in dissector doc
     
-    Change-Id: I63cdb7eead49207cf66ea36d1da966d1bbec4320
-    Reviewed-on: https://code.wireshark.org/review/5774
+    Change-Id: I5ca20080f99905ab23d484d0be054a89c406c583
+    Reviewed-on: https://code.wireshark.org/review/15852
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit a89c17f
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Fri Dec 12 11:11:00 2014 +0100
+commit 752a8ea
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sun Jun 12 18:46:46 2016 +0200
 
-    Bluetooth: BTLE: Add src/dst addresses when they are known
+    expert_info_dialog (Qt): fix Uninitialized members (UNINIT_CTOR) reported by Coverity (CID 1362692)
     
-    Generally where it is not connection then on LinkLayer protocol level
-    addresses for Source and Destination device are known.
-    
-    Change-Id: I28da88381a26826ad4897b56da993909130683d3
-    Reviewed-on: https://code.wireshark.org/review/5768
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: I1bc71ac7b9c08a9a5749aa9bc88863fa10eb27c7
+    Reviewed-on: https://code.wireshark.org/review/15848
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
 
-commit afacb1c
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Sun Nov 16 13:20:04 2014 +0100
+commit bc35660
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sat Jun 11 18:09:05 2016 +0100
 
-    Bluetooth: Fix CRC Init length in Ubertooth
+    IPv6: Add dissection for SRH flags
     
-    Change-Id: If4292c85598e2449eff54d6680274edc3c3e4fa2
-    Reviewed-on: https://code.wireshark.org/review/5770
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: I535aba36cc906e8d78cb594900e9a7fdcbd26c83
+    Reviewed-on: https://code.wireshark.org/review/15828
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: João Valverde <j@v6e.pt>
 
-commit 79d6a15
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Wed Dec 3 11:06:49 2014 +0100
+commit d6e9665
+Author: Thibault Gerondal <github@tycale.be>
+Date:   Sat May 28 02:55:04 2016 +0200
 
-    Bluetooth: BTLE: SN, NESN should be numbers not booleans
+    IPv6: Add support for Segment Routing (Type 4) Extension Header
     
-    SN = Sequence Number, so it is not bool.
-    
-    Change-Id: I0691b17150bbbdd34a0e7cbe3cb90058c9183ff7
-    Reviewed-on: https://code.wireshark.org/review/5769
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Bug: 12512
+    Change-Id: I5672ff3b8c4e8afcc82e957933330e0bf9454b08
+    Reviewed-on: https://code.wireshark.org/review/15593
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: João Valverde <j@v6e.pt>
 
-commit 657e42b
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Mon Nov 17 19:26:12 2014 +0100
+commit cee3e82
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sat Jun 11 06:10:17 2016 +0100
 
-    cmake: Do not hide possible options for other platforms
+    CMake: Make PROJECT_VERSION_EXTENSION code simpler
     
-    Change-Id: I408620cb39a25a4104e9ea562f6512f4196ae32f
-    Reviewed-on: https://code.wireshark.org/review/5766
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit fddbbdd
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Sun Nov 16 13:18:50 2014 +0100
-
-    Translates: Update Polish translation
+    The intent was to allow all sorts of overrides but, ugly.
     
-    Also fix typo.
+    I don't think we need $cmake_package_string either, at least with
+    these changes.
     
-    Change-Id: If494e7ae8e24cf394b4c67208799e6fb358cf8f0
-    Reviewed-on: https://code.wireshark.org/review/5767
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 6919734
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Dec 14 19:48:43 2014 +0100
-
-    HTTP2: Update nghttp2 lib (0.6.7)
+    Follow-up to 7c6e859ccf210a45e1cc0f6da17692845e6b5a23.
     
-    lot of change but it is majority reindent change (Using clang-format)
+    (And bdec712166ba924a2cdeaaca8ae580c343eaf02c).
     
-    Change-Id: Idcd0fa79ca977e25d69eb80a89d3c61d228885e9
-    Reviewed-on: https://code.wireshark.org/review/5764
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I808b6bd3a3c64d2a67165344e8fe23e8314c27db
+    Reviewed-on: https://code.wireshark.org/review/15835
+    Reviewed-by: João Valverde <j@v6e.pt>
 
-commit 9815dc1
-Author: maisheri <maisheri.hitesh@gmail.com>
-Date:   Sun Dec 14 01:44:20 2014 +0530
+commit 38d39f2
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jun 12 12:18:14 2016 -0700
 
-    Add support for EAPOL-MKA (802.1x-2010)
+    Have MemoryCheck() directly incorporate the error message and exit.
     
-    Use by MACSec
+    Manually inline memory_error() in MemoryCheck(), so that static
+    analyzers know that, if MemoryCheck() sees a null pointer, it exists,
+    and the null pointer isn't subsequently used.
     
-    Change-Id: I27eee40ddc476435aecd57711c1b3597c2049901
-    Reviewed-on: https://code.wireshark.org/review/5751
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 16f38e9
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Dec 14 17:03:08 2014 +0100
-
-    Kerberos: import KRB5_AD_WIN2K_PAC dissection from old non ASN.1 based dissector
+    Use MemoryCheck() instead of the one place where we manually checked for
+    a null pointer and called memory_error().
     
-    Bug: 10539
-    Change-Id: I06d1179210bdcc63800ef9580bb274c714a77c6e
-    Reviewed-on: https://code.wireshark.org/review/5761
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: Id6b0328cfd17cb14ec9d1e461420896a31573c71
+    Reviewed-on: https://code.wireshark.org/review/15851
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit e9f9683
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Dec 14 18:57:03 2014 +0100
+commit 7bbc60c
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jun 12 10:34:16 2016 -0700
 
-    GSM SMS: fix dissection of Character Set IE
+    Add more memory checks, and use MemoryCheck() for some existing checks.
     
-    Also do not display a 8bits data SMS as an expert error
-    Those 2 points led me to a wrong analysis yesterday
+    Always check for malloc() and realloc() failing.  Use MemoryCheck() for
+    most of the checks - it's a bit cleaner and makes the error message the
+    same for those checks.
     
-    Change-Id: Ib319e2ef8f0e7297cd2e119b6d0d98638e6a3d61
-    Reviewed-on: https://code.wireshark.org/review/5763
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I533153c697b37b85adfa0259c1352efece0b0486
+    Reviewed-on: https://code.wireshark.org/review/15849
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 44e14b7
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sun Dec 14 09:49:02 2014 -0800
+commit aaba30a
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jun 10 11:16:10 2016 -0700
 
-    Qt: Defer startup messages.
+    Qt: Draw a border around inactive+selected packet list items.
     
-    Wait until we've completely started up to show accumulated warnings and
-    errors.
+    Try to make inactive+selected packet list items more visible by drawing
+    a border around them. Make an exception for Windows 7 and Vista if a
+    theme is active.
     
-    Replace three periods with an ellipsis.
-    
-    Change-Id: Ic3b268836e4e4429786c5eba4862cbc0458a19b5
-    Reviewed-on: https://code.wireshark.org/review/5762
+    Bug: 12010
+    Change-Id: I974069dda92588b80772f577f319569751ff3347
+    Reviewed-on: https://code.wireshark.org/review/15816
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 85ed008
+commit a5ff5c2
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Dec 14 08:04:53 2014 -0800
+Date:   Sun Jun 12 08:11:17 2016 -0700
 
-    [Automatic manuf, services and enterprise-numbers update for 2014-12-14]
+    [Automatic update for 2016-06-12]
+    
+    Update manuf, services enterprise-numbers, translations, and other items.
     
-    Change-Id: Ic1cf4600f35ca5e573c88e758971c578489ab673
-    Reviewed-on: https://code.wireshark.org/review/5758
+    Change-Id: I14deff6b9a13a51d66ebdea361686822583b07c0
+    Reviewed-on: https://code.wireshark.org/review/15843
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 1725eee
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Sat Dec 13 16:26:07 2014 -0500
+commit b882478
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sat Jun 11 14:23:59 2016 +0200
 
-    Use ENC_BIG_ENDIAN when fetching FT_U?INT8 fields ...
+    mongo: don't THROW() an exception from a dissector
+    
+    just return the overall length even if the value is not in line with the
+    protocol specification
     
-    Change-Id: Ie8cb993bb9dd3e8dbfa1876a4e731bca10ee0507
-    Reviewed-on: https://code.wireshark.org/review/5754
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: Ieeb5d1d265acb6de807a1175f07c7981db4b6c2b
+    Reviewed-on: https://code.wireshark.org/review/15833
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 5992ef4
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Sat Dec 13 15:17:21 2014 -0500
+commit be12133
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Sat Jun 11 14:21:17 2016 +0200
 
-    plugins: replace ENC_NA by ENC_..._ENDIAN when fetching integral types
+    Actually progress through the command data (CID-281394)
     
-    Change-Id: I3958bbd0eadd4472a003ea272e596026ad8731d1
-    Reviewed-on: https://code.wireshark.org/review/5753
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    The loop reading through the command data doesn't progress through
+    it, it just reads until the available data (represented by max_length)
+    runs out. It therefore:
+    - doesn't present the commands
+    - doesn't detect a missing final marker bit (CID-281394)
+    This change does make the code progress through the command data,
+    fixing both issues in the process.
+    
+    Change-Id: I61ba8b56b4a153affe9b4f9a574267f981ef0594
+    Reviewed-on: https://code.wireshark.org/review/15825
+    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 94d7e8d
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Sat Dec 13 14:59:26 2014 -0500
+commit 416c8a1
+Author: Balint Reczey <balint@balintreczey.hu>
+Date:   Fri Apr 29 10:21:44 2016 +0200
 
-    Use ENC_LITTLE_ENDIAN when fetching FT_U?INT8 fields ...
-    
-      (for some dissectors which fetch all other integral fields using
-       ENC_LITTLE_ENDIAN).
+    debian: Regenerate ASN.1 dissector code during package build
     
-    Change-Id: Ica72a68ac560f2920d61e0769de83130557c46fd
-    Reviewed-on: https://code.wireshark.org/review/5752
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: I3f7378ae5c048d3f954238bd04c707f039401ea1
+    Reviewed-on: https://code.wireshark.org/review/15161
+    Petri-Dish: Balint Reczey <balint@balintreczey.hu>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit ff46ac5
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Sat Dec 13 12:36:23 2014 -0500
+commit 2d095de
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Fri Jun 10 00:00:39 2016 -0400
 
-    rfid-pn532.c: Use FT_UINT24 to display complete hex value for three 3-byte fields.
+    Move Gateway Control Protocol (Context Tracking) into packet-h248.h
     
-    Specifically: the fields are fetched as 3 bytes, but had a
-     type, display of FT_UINT8, BASE_HEX so only that the LO byte was
-     displayed.
+    The Gateway Control Protocol (Context Tracking) is used by both H248
+    and MEGACO, so the functionality was refactored to epan, but should
+    really be kept in the dissector directory to minimize (and eventually
+    completely remove) the epan directory's dependence on it.
     
-    Change-Id: I06ea7b9527ae788be7f19278e8ba4dc2d34b2777
-    Reviewed-on: https://code.wireshark.org/review/5747
-    Reviewed-by: maisheri <maisheri.hitesh@gmail.com>
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: I387b46aecde97234086bfdb7d8c546854fa301cd
+    Reviewed-on: https://code.wireshark.org/review/15798
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit ae844d9
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Sat Dec 13 13:51:33 2014 -0500
+commit 68ef5db
+Author: Michael Vigovsky <upliner@gmail.com>
+Date:   Fri Jun 10 15:17:49 2016 +0300
 
-    gsm_sms: Use ENC_BIG_ENDIAN when fetching FT_U?INT8 fields
+    Add missing scale in TDS type info
     
-    Change-Id: If41cf6c10e4af8554cd8f6a69bd8654ad7262c85
-    Reviewed-on: https://code.wireshark.org/review/5749
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: I6734fe448e4ee6f20a0d57b1aaae5e7e61f0cb5c
+    Reviewed-on: https://code.wireshark.org/review/15811
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit f412c9a
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Sat Dec 13 12:52:20 2014 -0500
+commit 5416a34
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sat Jun 11 19:13:14 2016 -0700
 
-    Use ENC_BIG_ENDIAN when fetching FT_U?INT8 fields ...
+    Handle zero-length addresses in cmp_address().
     
-      (for some dissectors which fetch all other integral fields using
-       ENC_BIG_ENDIAN).
+    Don't compare the data if there's none to compare.
     
-    Change-Id: Ic18e3172aad76af12b12d6732c88497be22aed56
-    Reviewed-on: https://code.wireshark.org/review/5748
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: Ib0e3541e448127869d19afddfc71bb441dba5874
+    Reviewed-on: https://code.wireshark.org/review/15840
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 7592d39
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Dec 13 18:15:52 2014 +0100
+commit 24f02da
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sat Jun 11 18:59:25 2016 -0700
 
-    GSM SMS: fix 'msg_class' may be used uninitialized in this function warning
+    Add checks to address setting routines.
     
-    Change-Id: Ie1c53929df2dfec1b4935ca1088f375c666d3b36
-    Reviewed-on: https://code.wireshark.org/review/5746
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 21d6ed4
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Dec 13 18:10:58 2014 +0100
-
-    fix compile error
+    Fail if:
     
-    packet-gsm_sms.c: In function 'dis_field_dcs':
-    packet-gsm_sms.c:694:12: error: 'msg_class' may be used uninitialized in
-    this function [-Werror=maybe-uninitialized]
-    cc1: all warnings being treated as errors
-    make[5]: *** [libdissectors_la-packet-gsm_sms.lo] Error 1
+       1) you have an AT_NONE address with data;
     
-    I suppose that 0xff is an invalid message class and therefore a
-    reasonable default value.
+       2) you have a non-AT_NONE address with a zero length and a
+          non-null data pointer, or with a non-zero length and a null
+          data pointer.
     
-    Change-Id: Iab3d3f50144b24bee4972063c2170d7a9f9b7c25
-    Reviewed-on: https://code.wireshark.org/review/5745
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 758ec16
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Dec 13 17:38:30 2014 +0100
-
-    GSM SMS: fix (U)SIM Data Download Class 2 dissection
+    When comparing addresses for equality, just make sure the types are the
+    same, the lengths are the same and, if the lengths are non-zero, the
+    data is the same; don't treat AT_NONE specially - the "lengths are
+    non-zero" check will make sure we do the right thing.
     
-    Change-Id: Id4ea574e34c0bd35bc757fdc68d0e6b72129ef04
-    Reviewed-on: https://code.wireshark.org/review/5744
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 80d44af
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Dec 13 17:27:28 2014 +0100
-
-    dissector_try_uint(_new) and dissector_try_string now return the number of bytes consumed
+    Make sure when we create an AT_NONE address it has a zero length and
+    null data pointer.
     
-    Change-Id: I528ad736caee1f29e2f0abfc0afcca6587d74eca
-    Reviewed-on: https://code.wireshark.org/review/5743
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I5c452ef0d140c2d9aef3004f1cfd124a95b78fb2
+    Reviewed-on: https://code.wireshark.org/review/15839
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit cc12c72
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Dec 12 23:37:05 2014 +0100
+commit 4cab051
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Sat Jun 11 14:49:59 2016 +0200
 
-    Riemann: add support for TCP transport
+    Store the tree item to add to later (CID-1159152)
     
-    Bug: 10770
-    Change-Id: I101d0152f41c0ab3d7f0fa0ccab6dec3b9e68f0d
-    Reviewed-on: https://code.wireshark.org/review/5741
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Petri-Dish: Evan Huus <eapache@gmail.com>
+    The tree item needed to test and append to isn't being stored,
+    so the items are never amended with notes, resulting in dead code.
+    
+    Change-Id: Ib1a9b7994ad12a9a9013d1bc1e1e4c165f34f20f
+    Reviewed-on: https://code.wireshark.org/review/15826
+    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 5d6eb80
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Fri Dec 12 16:53:05 2014 +0000
+commit 21007dc
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Thu Jun 9 11:02:33 2016 -0400
 
-    Use g_direct_ functions for hash tables where possible
+    H225: Replace globals that track packet data with p_add_proto_data/p_get_proto_data.
     
-    Change-Id: Ie364cbdcf500d7a04e64d7adcdd03bd1926dda86
-    Reviewed-on: https://code.wireshark.org/review/5736
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: I0380151fb0f45063b81bc55dd5b8dc4add99ad30
+    Reviewed-on: https://code.wireshark.org/review/15794
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit b0cdee6
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Dec 10 16:26:42 2014 +0100
+commit e659faa
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sat Jun 11 13:28:29 2016 -0700
 
-    DNS: Remove whitespace on DNS Col info before type name
+    Line up comments.
     
-    Change-Id: I33a9a54a318a1a3ea106f4531db4e79a6b6d42ac
-    Reviewed-on: https://code.wireshark.org/review/5716
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: Ifda0499e00dfa38c936f7e054ab4d5b3a0fd627f
+    Reviewed-on: https://code.wireshark.org/review/15830
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 33c26a0
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Dec 12 22:20:35 2014 +0100
+commit de028e8
+Author: Vincent Helfre <vincenthelfre@googlemail.com>
+Date:   Thu Jun 9 17:47:20 2016 +0200
 
-    doc: remove some references to the now defunct python support
+    GSM RLC/MAC: improve dissection of Packet Resource Request message
     
-    Change-Id: Ibba3168516ef28ad050f5f70045acf3935f2b233
-    Reviewed-on: https://code.wireshark.org/review/5738
+    Change-Id: I8513ef550e81a97e1a8ac1c1f365355118d5ebae
+    Reviewed-on: https://code.wireshark.org/review/15827
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 56697c2
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Dec 12 12:35:31 2014 -0800
+commit e00d73a
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun May 29 16:35:22 2016 +0200
 
-    Qt: Add name resolution menu items.
-    
-    Change the text from "Enable for" to "Resolve". Make the tooltips more
-    descriptive. List them in OSI model order.
+    dcerpc-browser: don't THROW() an exception from a dissector
     
-    Change-Id: Ie671ba9d55c609ce475f1681add0ad7d975f19cd
-    Reviewed-on: https://code.wireshark.org/review/5737
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 2898f13
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Thu Dec 11 15:21:28 2014 -0500
-
-    cip: Access FT_UINT16 hf_cip_sc_create_instance with proper encoding-arg.
+    the condition for THROW() will never be true
     
-    Specifically: Use ENC_LITTLE_ENDIAN (not ENC_NA) to match all
-                  other integral fetches in the cip dissector.
+    there's no way to decrement offset below its initial value
+    the dissect_browser_TYPE_x_data() functions read a uint32 and increment
+    offset by 4 + the uint32 value that was read
     
-    Change-Id: I5d330084168493f53135dbb97674a2dba9ed7477
-    Reviewed-on: https://code.wireshark.org/review/5732
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: Ia5a63e714ffa0add601960d858452152e4d9b10b
+    Reviewed-on: https://code.wireshark.org/review/15627
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 64cb510
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Thu Dec 11 18:37:07 2014 -0500
+commit c755c88
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Fri Jun 3 20:11:56 2016 +0200
 
-    Change ENC_NA to ENC_BIG_ENDIAN for all fetches of integral type fields.
+    iso14443: dissect attrib's p3 byte
     
-    Change-Id: Ia4f5735c61eedcbe8354eabd5da05d02e167f25e
-    Reviewed-on: https://code.wireshark.org/review/5734
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: Iec3595a9ee0f7037af1f949804f1022f315d1edc
+    Reviewed-on: https://code.wireshark.org/review/15824
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit 29c1b58
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Thu Dec 11 14:21:09 2014 -0500
+commit 5932044
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Fri Jun 10 19:30:36 2016 +0100
 
-    rsvp: Convert encoding-arg ENC_NA to ENC_BIG_ENDIAN for all integer fields
+    ftype-protocol: Fix [-Wcast-qual] warnings
     
-    Change-Id: Ib0f863f08a3ef420832cc05e988b5bc64ff0b121
-    Reviewed-on: https://code.wireshark.org/review/5731
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: Ia8a02d8dc66aead486c8ae3f0bdf4cd82717ed20
+    Reviewed-on: https://code.wireshark.org/review/15817
+    Petri-Dish: João Valverde <j@v6e.pt>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 76c5568
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Dec 12 16:26:53 2014 +0100
+commit b8779f9
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Jun 10 15:05:23 2016 -0700
 
-    Riemann: fix compilation
+    More comment clarification.
     
-    Change-Id: I0cf069860715fd6781a613478c29a7e7ed224733
-    Reviewed-on: https://code.wireshark.org/review/5735
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 8e96830
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Dec 12 15:19:58 2014 +0100
-
-    LPP: avoid doing an out of bound access in case the PER decoding gives an invalid value
+    That's not "the biggest record we're willing to write", it's "the
+    biggest record the pcapng format supports, as the record length is a
+    16-bit field".
     
-    Bug: 10773
-    Change-Id: I4fcde84d7be1e42729b6ec0763064e9885951468
-    Reviewed-on: https://code.wireshark.org/review/5729
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: Icbd5e0cc4ed8e2a3a0d474245a9b9ed2c999d520
+    Reviewed-on: https://code.wireshark.org/review/15818
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 09de28933f9a17d4472206e1ac4b7c92001e44f5)
+    Reviewed-on: https://code.wireshark.org/review/15820
 
-commit a2a6e31
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Dec 12 10:14:26 2014 +0100
+commit 8626cef
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Jun 10 11:02:07 2016 -0700
 
-    Riemann: fix "Decode as" feature
+    Make the IPv4 NRB code's comments match the IPv6 NRB code's comments.
     
-    the UDP port value check seems useless when the port is configured in the preferences, and prevents "Decode as" to work as expected
+    The IPv6 comments gave more details.
     
-    Change-Id: I5a059d05a9e980c2c60d8f84deae1b5bd9d466d3
-    Reviewed-on: https://code.wireshark.org/review/5727
-    Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit bd4d291
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Nov 26 16:59:22 2014 +0100
-
-    Qt: Move Follow TCP, UDP, SSL to a Follow folder (like when right click)
-    
-    Change-Id: I24213aa4f9f134a05b1344e160e5688ce9c495cf
-    Reviewed-on: https://code.wireshark.org/review/5508
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I4e4d865feadbabfd625cdf2b2b162b99c4f23efa
+    Reviewed-on: https://code.wireshark.org/review/15815
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 1ce64e7
+commit 00d36c7
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Dec 10 16:50:56 2014 -0800
+Date:   Thu Jan 14 11:15:46 2016 -0800
 
-    CMake: Make it easier to generate the release notes & NEWS.
-    
-    Add convenience targets for generating the release notes and the NEWS
-    file. Make sure we don't run multiple instances of a2x + AsciiDoc at the
-    same time.
+    Qt: Expert info grouping.
     
-    Add the docbook directory to the build by default unless we're running
-    Windows. Explain why we don't yet build docs on Windows. Make each
-    docbook makefile target optional.
+    Add the ability to group expert info items by summary and enable it by
+    default. This more closely matches the GTK+ UI behavior.
     
-    Split the ENABLE_GUIDES option into ENABLE_HTML_GUIDES and
-    ENABLE_PDF_GUIDES. Add a default "all_guides" target if either is on.
-    Remove the Debian patch that hacked around the PDF requirement.
+    Show matching item counts while we're here.
     
-    Copy ws.css to the docbook build directory. Don't build PDF release
-    notes. I'm not sure we ever used them and I don't want to install Java
-    and FOP just to make a release.
-    
-    Change-Id: Ia2f710000c17f9e0b4b514fd373d9a5902889553
-    Reviewed-on: https://code.wireshark.org/review/5712
+    Bug: 12218
+    Change-Id: Ic02267da8435fb70015de8dd15e0ac46faabbee9
+    Reviewed-on: https://code.wireshark.org/review/15796
     Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 425bc30
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Thu Dec 11 14:01:10 2014 -0500
-
-    eth,mp2t: Rename ei[] filter names duplicating hf[] filter names.
-    
-    Change-Id: I1a9e8344866ce5a5bbd48b07c49baa398ce161f7
-    Reviewed-on: https://code.wireshark.org/review/5724
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+commit 237f2d4
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Tue May 19 11:55:01 2015 +0200
+
+    Qt/Bluetooth: Add Device dialog
+    
+    Device dialog appears when user double clicks on device in
+    Devices dialog (Bluetooth->Devices). It provides
+    summary of device, like BD_ADDR, name, timeouts, etc.
+    Base on information from HCI layer, so this feature is more interesting
+    for local devices (capturing on its side). Each field has changes counter,
+    what mean that value at specified field changes in time, for example:
+    user change device name 3 times. Please note that initial change
+    is not counted. It means that you can see fielkd without any value
+    then change occur and counter is not increased. It will be increased
+    next time. Reason for that is in most cases field value is unknown
+    at start.
+    
+    Change-Id: Ife0a6bd454eac00a28f8eb2906e1b395695b0307
+    Reviewed-on: https://code.wireshark.org/review/15793
+    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
 
-commit 8f56378
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Thu Dec 11 13:50:17 2014 -0500
+commit 2df337d
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Fri Jun 10 08:42:41 2016 +0200
 
-    rsvp: Fix dup display-filter name possibly leading to crash if used.
+    Bluetooth HCI (Qt): Remove Q_UNUSED
     
-    Change-Id: I8b903fb1137800a84473a82cff9c45f965cb869f
-    Reviewed-on: https://code.wireshark.org/review/5723
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit 0ef1aef
-Author: Yann Lejeune <ylejeune@netyl.org>
-Date:   Wed Dec 10 23:15:07 2014 +0100
-
-    BGP: add support of RFC6368 - Internal BGP as the Provider/Customer Edge
-         Protocol for BGP/MPLS IP Virtual Private Networks (VPNs).
+    See g21754f43e for detail
     
-    Bug: 10762
-    Change-Id: Ifbe2af639ee5a2d96ec3546708060cadcc349df2
-    Reviewed-on: https://code.wireshark.org/review/5664
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    There is always some other Q_UNUSED but include on #if/#endif...
+    
+    Change-Id: Ib2283660c91787acbf6392841faa3db6aed39438
+    Reviewed-on: https://code.wireshark.org/review/15803
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
 
-commit 9036f09
-Author: Yann Lejeune <ylejeune@netyl.org>
-Date:   Wed Dec 10 22:36:36 2014 +0100
+commit e53a1ad
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Jun 10 00:40:18 2016 -0700
 
-    BGP: extract the bgp path attribute dissection to a dedicated function.
+    Always count packets per encapsulation.
     
-    Change-Id: I228f1402007d8570bfdeb0105ce5e89c48357481
-    Reviewed-on: https://code.wireshark.org/review/5721
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Currently, for pcapng files, if all of the IDBs we've seen *so far* are
+    the same, we report it as the file's encapsulation type; however, we may
+    see IDBs of a different type in the future, so don't check for
+    per-packet encapsulation before counting packets of the encapsulation
+    type.
+    
+    Change-Id: I617ddcf2963aa16e7ba58855b3e5bf326ab7dc32
+    Reviewed-on: https://code.wireshark.org/review/15808
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 7d905be
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Dec 11 11:36:34 2014 +0100
+commit 1438d28
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Jun 10 00:31:36 2016 -0700
 
-    GSM BSSMAP LE: fix indent (use tabs)
+    Set the size of the packet counts array when we create it.
     
-    Change-Id: Ic05a52d095fd581150fc69ca8d2a0e05eaddf81a
-    Reviewed-on: https://code.wireshark.org/review/5722
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    g_array_sized_new() sets the amount of *space allocated for* the array,
+    but doesn't actually set its *length*.
+    
+    Change-Id: Ia7deab34c758c88910dfb0e246a6903301e68029
+    Reviewed-on: https://code.wireshark.org/review/15806
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 772fbfb
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Dec 11 11:32:48 2014 +0100
+commit 3ba7798
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Thu Jun 9 23:59:34 2016 -0700
 
-    GSM a BSSMAP : fix warning: no previous prototype for 'dissect_bssmap' [-Wmissing-prototypes]
+    Set cf_info.num_interfaces before using it.
     
-    Change-Id: Ibc03864498cb88e93cb3f774d1f4987aa10dd32e
-    Reviewed-on: https://code.wireshark.org/review/5720
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I6ba5932f339ea6296dd91a6800721b11bcd4956a
+    Reviewed-on: https://code.wireshark.org/review/15804
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 230ce30
+commit 777cddd
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Dec 11 11:32:25 2014 +0100
+Date:   Fri Jun 10 07:04:44 2016 +0200
 
-    GSM bssmap le: fix warning: no previous prototype for 'dissect_bssmap_le' [-Wmissing-prototypes]
+    LANforge: fix wrong offset for magic detection
     
-    Change-Id: Ifa8c7a15dfb37cf1dbd2f539dd0bbc87e6da1aea
-    Reviewed-on: https://code.wireshark.org/review/5719
+    Issue reported by Brent Lovelace https://www.wireshark.org/lists/wireshark-dev/201606/msg00034.html
+    
+    Change-Id: If296f01747316ddbe28e88d4d11d9df90d68bc5d
+    Reviewed-on: https://code.wireshark.org/review/15800
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit def4313
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Dec 11 11:27:39 2014 +0100
+commit a4afda6
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Thu Jun 9 23:51:04 2016 +0200
 
-    6lowpan : fix warning: no previous prototype for 'lowpan_context_free' [-Wmissing-prototypes]
+    Remove superfluous length check (CID-1158783)
+    
+    When entering a loop with check for minimum length, don't stick
+    to the pattern of checking length first thing.
     
-    Change-Id: I3fa66aa0713a0455639b04ecf129f48baa8c096f
-    Reviewed-on: https://code.wireshark.org/review/5718
+    Change-Id: I28c414108efa5499dbacd8527b2c3e654e49e808
+    Reviewed-on: https://code.wireshark.org/review/15795
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit b7f8cd8
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Dec 7 19:47:54 2014 +0100
+commit 4233e9a
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Thu Jun 9 20:32:35 2016 -0700
 
-    skip the extra field in the gzip header
-    it consists of two bytes xsize + xsize bytes of data
+    Don't assume all IDBs are available aftre we open the file.
     
-    use an unsigned type for xsize
+    IDBs can occur anywhere in the file, so if we see an interface ID bigger
+    than the number of IDBs we've see, re-fetch the interface information,
+    update the IDB count, and grow the packet count array as necessary.
     
-    fail gracefully if the field is present but truncated
+    Get the information strings for interfaces after reading the entire
+    file; we don't need them until then.
+    
+    Change-Id: Ib6096e481e321de485710d14eadf7b5232bf0be7
+    Reviewed-on: https://code.wireshark.org/review/15797
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit f928a5f
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Thu Jun 9 08:04:04 2016 +0200
+
+    Make the determination if file is relative. (CID-1348040)
     
-    tvb_length_remaining > tvb_captured_length_remaining
+    The code tries to show a file handle when the file is relative
+    to it, but doesn't actually make that determination. Extract the
+    relevant bit and use that to flag the relative file.
     
-    Change-Id: I7f5138743c2d88abdd4f5f18d3c0292612ddb559
-    Reviewed-on: https://code.wireshark.org/review/5654
+    Change-Id: I7259c8843dc388b9dda96a73399a6da5575d3f5e
+    Reviewed-on: https://code.wireshark.org/review/15789
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 5570f8e
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Dec 11 10:30:08 2014 +0100
+commit 0ccde30
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Wed Jun 8 23:28:07 2016 -0400
 
-    [SIP] Try to fix another corner case of reassembly.
+    MGCP: Replace globals that track packet data with passing data to functions.
     
-    Change-Id: I38a80ebcadf0ef6d7fada692753188f2a6c3515b
-    Reviewed-on: https://code.wireshark.org/review/5717
+    Change-Id: I9595abf882adb821fd3c08532afba1b7e20412fe
+    Reviewed-on: https://code.wireshark.org/review/15788
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 339df3d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 10 20:15:36 2014 -0800
+commit 9fd37c0
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Tue May 3 22:50:26 2016 +0200
 
-    Add a heur_dissector_table_foreach() function.
+    Qt/Bluetooth: Set missing HCI Summary Occurence fields
     
-    This is, for heuristic dissector tables, the equivalent of
-    dissector_table_foreach() for keyed dissector tables.
+    Set they to zeros at startup like other fields.
     
-    Change-Id: I4b2f870e1c1179fda1adddd93930b83aaaaf8763
-    Reviewed-on: https://code.wireshark.org/review/5715
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I820e7a0ce8fad5726448cb83f85235ecf578d77d
+    Reviewed-on: https://code.wireshark.org/review/15792
+    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
 
-commit 151164d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 10 19:04:50 2014 -0800
+commit 508e0f4
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Wed Jun 8 17:18:45 2016 +0200
 
-    Give dissector_all_heur_tables_foreach_table() a sort function.
+    Bluetooth: ATT: Fix Object List Control Point response
     
-    This makes it a bit more like dissector_all_tables_foreach_table.
+    Fix CID 1355646.
     
-    Improve comments and clean up whitespace while we're at it.
+    Bug: 12496
     
-    Change-Id: I5147427f864add285e3bb6cb35ad9fa83bea516c
-    Reviewed-on: https://code.wireshark.org/review/5714
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ia6c95c8f31a19b5e8fc21182658147ed4208d635
+    Reviewed-on: https://code.wireshark.org/review/15790
+    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
 
-commit 9855bef
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 10 17:50:34 2014 -0800
+commit 2a0d61e
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Sun May 29 11:10:24 2016 +0200
 
-    Make the type of the second argument to a DATFunc_heur_table explicit.
-    
-    It's always pased a heur_dissector_list_t *, so give it that type,
-    rather than having it be a generic pointer.
+    Logcat: Unicodize texts
     
-    Change-Id: Ia6a045bb1b96c2f6ef3e23f27928e0b52f7cfb9f
-    Reviewed-on: https://code.wireshark.org/review/5713
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 144855c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 10 16:21:41 2014 -0800
-
-    Fix a comment.
+    Text over Logcat is in real in Unicode.
+    ASCII does not display it correctly.
     
-    Change-Id: I46885d028fe9ff5254baefc15283626b9bdb6bce
-    Reviewed-on: https://code.wireshark.org/review/5711
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I998dad1ee50c4b00b874a1f197f6e465fadd3e38
+    Reviewed-on: https://code.wireshark.org/review/15791
+    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
 
-commit 2f8030f
+commit d907fc2
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Dec 10 19:57:56 2014 +0100
+Date:   Wed Jun 8 22:26:02 2016 +0200
 
-    LCSAP: fix dissection of negative longitude and latitude
+    Update Developer's Guide to reflect dissector_t signature change
     
-    Bug: 10767
-    Change-Id: I4ab0ffd3bd22f1884895f3118673b433d980de2f
-    Reviewed-on: https://code.wireshark.org/review/5704
+    Change-Id: Ia793d94c7e79e49d1f27ad8adbdbafdb30131abe
+    Reviewed-on: https://code.wireshark.org/review/15783
     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: Anders Broman <a.broman58@gmail.com>
 
-commit 088e5fe
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Dec 10 20:33:38 2014 +0100
+commit 078ab45
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Jun 8 18:12:48 2016 -0700
 
-    GPRSCDR: Remove from Dirty ASN1 list
+    Use the locale's decimal separator for times as seconds and fraction.
     
-    Change-Id: I0d19836aa63ac77a1b19aec0ae66921bf4770005
-    Reviewed-on: https://code.wireshark.org/review/5707
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0980dd5
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Dec 10 20:23:07 2014 +0100
-
-    GPRSCDR: fix warning: 'dissect_gprscdr_MBMSInformation' defined but not use
+    We use it when printing *other* seconds-and-fraction values, as we're
+    just using %f, so we should use it consistently.  If you don't want
+    commas as decimal separators, you presumably don't want them anywhere;
+    if you want to standardize the way numbers are shown, set the locale to
+    the C locale.
     
-    Change-Id: I4bdbaeb3c1e3327af6f5e3de22ebcd4472b9f3e7
-    Reviewed-on: https://code.wireshark.org/review/5706
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    This addresses one of the two problems mentioned in bug 12500; there may
+    be other places in the Wireshark suite where we should use the locale's
+    decimal separator in times.
+    
+    Change-Id: I41f1c44d12ebf0f46ff678c977a955d09831b0cf
+    Ping-Bug: 12500
+    Reviewed-on: https://code.wireshark.org/review/15787
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit dc289d7
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Dec 10 11:55:04 2014 -0800
+commit 6ec6beb
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Jun 8 16:26:18 2016 -0700
 
-    Update the release notes.
-    
-    Add a note about HiDPI / retina. Remove the Kerberos known problem.
+    ieee80211_htrate() isn't exported.
     
-    Change-Id: I452bc5ed9db51f7bf32b25eab39371fafd3102aa
-    Reviewed-on: https://code.wireshark.org/review/5708
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I8a7a4727b473820d46ee543875f9fb57c5d79928
+    Reviewed-on: https://code.wireshark.org/review/15786
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 3f08a85
+commit bdec712
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Dec 10 11:15:16 2014 -0800
+Date:   Wed Jun 8 14:55:06 2016 -0700
 
-    1.99.1 → 1.99.2.
+    2.1.0 → 2.1.1.
     
-    Change-Id: Ie2e9e81ce1b1d876ae550fc0c17c4367aaa35d98
-    Reviewed-on: https://code.wireshark.org/review/5705
+    Change-Id: Ib8aab341be406d3c6e9139ae670489bd9e3edcc5
+    Reviewed-on: https://code.wireshark.org/review/15785
     Reviewed-by: Gerald Combs <gerald@wireshark.org>