Replace "svn" with "git" all over the place.

Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate.
Rename "svnversion.h" to "version.h" as Evan suggested. Update some
URLs. In make-version.pl, make sure we don't set an improper upstream
branch name. Use the number of commits + short hash from `git describe`
for package names by default.

Cherry-picked from g5086c0e with some manual intervention.

Change-Id: Ib4b3e52e10557e803d603aa2b1ea5d826845a102
Reviewed-on: https://code.wireshark.org/review/261
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit 5086c0e21d734612e12173acbee6a98b1a5df2ed)
Reviewed-on: https://code.wireshark.org/review/263
Add NSIS path discovery to config.nmake.

Chocolatey wants to install NSIS in "c:\Program Files" no matter what. Try
to locate makensis automatically, similar to the way we locate Python.

svn path=/trunk/; revision=51497
(cherry picked from commit dc87fa2d68a5dbc7693b5cc93e044a62af5ce39c)

Change-Id: Icf7e26f2df5a01a19ed1e652e9b668f4175148a9
Reviewed-on: https://code.wireshark.org/review/264
Reviewed-by: Gerald Combs <gerald@wireshark.org>
More SVN → Git conversion.

Change-Id: If89b3c752dfd92d9f1d22456a064dd2e0b45dc96
Reviewed-on: https://code.wireshark.org/review/266
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Force "printing" if -T is specified, even if -w is also specified.

Just as "tshark ... -P -w xxx" writes raw packets to xxx *and* writes
text packet summaries to the standard output, and just as "tshark ...
-V -w xxx" writes raw packets to xxx *and* writes text packet details to
the standard output, so should "tshark ... -T fff -w xxx" write raw
packets to xxx *and* write whatever "-T fff" (and any "-e" options)
specifies to the standard output.

Change-Id: I28ab3a4d48531f297533ec4dfb3742031eb69885
Reviewed-on: https://code.wireshark.org/review/278
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-on: https://code.wireshark.org/review/281
Add MPLS dissector to "ppp.protocol" table.  Bug 9492 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9492)

From Peter Paluch

svn path=/trunk/; revision=53694

Change-Id: Iee6b51807491170967a2822db8ccbab9b1e36204
Reviewed-on: https://code.wireshark.org/review/304
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-on: https://code.wireshark.org/review/305
Add bug 9492.

Change-Id: I412d5c56848f2a19c8bf2c2e50f1ad1db86ce793
Reviewed-on: https://code.wireshark.org/review/306
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-on: https://code.wireshark.org/review/309
[Automatic manuf, services and enterprise-numbers update for 2014-02-23]

Change-Id: Icbade2cf84449a950f0dcafd16730d419480885d
Reviewed-on: https://code.wireshark.org/review/318
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
NAS EPS: fix dissection of CS service notification message

Fixes bug 9789

Change-Id: I26ed1e9d8bb5b662af97d19f64b5f4b39374a5ee
Reviewed-on: https://code.wireshark.org/review/330
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

(cherry picked from commit dd4e5fcbdd1c54afd9da2764b00f8fef2febb682)

Change-Id: Ie5875149bc246840bf7d610420b2b2a1d15d2805
Reviewed-on: https://code.wireshark.org/review/334
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Don't intentionally use -1 as an hfindex: while only naughty before, with the
changes from r49644 you'll get complaints about the hf being unregistered...

Note that this code also intentionally passes -1 as an ett_index.  It doesn't
currently complain so I'm leaving it alone for now...

svn path=/trunk/; revision=49648
(cherry picked from commit 813dcf79a15d6527cce8a6a7bac4234de6ab577f with
manual intervention)

Change-Id: I38cf7946969972a9ab03a56966b10f880476f55c
Reviewed-on: https://code.wireshark.org/review/341
Reviewed-by: Gerald Combs <gerald@wireshark.org>
From stcook

clear the temporary buffer after each DXM channel data line

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9598

svn path=/trunk/; revision=54488
cherry-picked from 745c8660be2707df41d7cea3cd2725d18b9d6ff0 with
release note updates.

Change-Id: I80f0ed958517c90525def329b8fbdab26afe8f19
Reviewed-on: https://code.wireshark.org/review/343
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Don't mix emem and glib memory and init routines.

The seasonal memory is freed before the init routine is called, leading to a
whole bunch of use-after-free errors.

Fixes bug #9802 (and duplicates).

This introduces a few minor leaks but I can't find an easy way to add additional
free calls that doesn't lead to double-free errors.

Change-Id: I1536fcb8e96f5560ad366169e815f62967b3e40d
Reviewed-on: https://code.wireshark.org/review/407
Reviewed-by: Evan Huus <eapache@gmail.com>
Copy git-compare-abis from ge635d3f / master-1.10.

    Have git-compare-abis build in a sub-sub-subdirectory.

    We have a lot of relative includes which apparently weren't updated
    correctly when we moved the gtk directory to ui/gtk. For example,
    ui/gtk/about_dlg.c has

    The Autotools Makefile adds "-I../.." to the include path, which means
    we end up including the current, top-level version_info.h instead of the
    one in the compare-abis build directory.

Change-Id: Ie9d35057fe14bcb75736b54b7efb5f0a8deda39a
Reviewed-on: https://code.wireshark.org/review/437
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Quick fix for bug 8768. For now assume that only three logical channels
are valid. If we run into more add expert item and cap the channel
count.

svn path=/trunk/; revision=49787

Conflicts:
	epan/dissectors/packet-tetra.c

(cherry picked from commit c891784de783cf23b8cf2957929af162480e0c73)

Change-Id: I6974d755be544730fb4320b680299ce4040a47dc
Reviewed-on: https://code.wireshark.org/review/439
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
[Automatic manuf, services and enterprise-numbers update for 2014-03-02]

Change-Id: Idc5b60d4aaac166b0b434562ba6e900254455755
Reviewed-on: https://code.wireshark.org/review/446
Reviewed-by: Evan Huus <eapache@gmail.com>