[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=2ab9f509076c69a1b518e56322c5ffe759841357
Submitter: "Gerald Combs <gerald@xxxxxxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark

Commits:

2ab9f50 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Build 2.6.12.
    
    Change-Id: I319998b1bc43a28a63d9311496c590d06a034375
    Reviewed-on: https://code.wireshark.org/review/34844
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  9edc6a1   test+wslua: Fix our protofield test count.
     add  2ab9f50   Build 2.6.12.


Summary of changes:
 ChangeLog                      | 377 +++++++++++++++++++++++++++++++++++++++++
 NEWS                           |  78 +++++----
 docbook/release-notes.asciidoc |  29 +++-
 version.conf                   |  12 +-
 4 files changed, 452 insertions(+), 44 deletions(-)