Wireshark-commits: [Wireshark-commits] master-2.6 6e54ad8: Initialize master-2.6.

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Mon, 02 Apr 2018 18:43:22 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=6e54ad8b79e4fd8dbdc9fe02f6230ca85a25ea23
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-2.6
Repository: wireshark

Commits:

6e54ad8 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Initialize master-2.6.
    
    Change-Id: Ia34802f141b9057d0d36bab65077f95ec4566969
    Reviewed-on: https://code.wireshark.org/review/26709
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  9dde6d4   doc: minor changes in README files.
    adds  6e54ad8   Initialize master-2.6.


Summary of changes:
 .gitreview                          |  2 +-
 .tx/config                          |  4 ++--
 CMakeLists.txt                      |  8 ++++----
 CMakeOptions.txt                    |  2 +-
 cmake/modules/FindWSWinLibs.cmake   |  2 +-
 configure.ac                        | 12 ++++++------
 debian/changelog                    |  2 +-
 docbook/attributes.asciidoc         |  2 +-
 docbook/developer-guide-docinfo.xml |  2 +-
 docbook/release-notes.asciidoc      |  4 +---
 docbook/user-guide-docinfo.xml      |  2 +-
 epan/CMakeLists.txt                 |  2 +-
 epan/Makefile.am                    |  2 +-
 make-version.pl                     |  4 ++--
 tools/make-pixbuf-csource.pl        |  2 +-
 tools/win-setup.ps1                 |  4 ++--
 ui/gtk/Makefile.am                  |  2 +-
 version.conf                        |  9 +++++++++
 wiretap/CMakeLists.txt              |  2 +-
 wiretap/Makefile.am                 |  2 +-
 wsutil/CMakeLists.txt               |  2 +-
 wsutil/Makefile.am                  |  2 +-
 22 files changed, 41 insertions(+), 34 deletions(-)
 create mode 100644 version.conf