aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [Automatic manuf, services and enterprise-numbers update for 2013-06-09]master-1.6Gerald Combs2013-06-092-11/+46
* Update the ChangeLog.Gerald Combs2013-06-071-270/+3
* 1.6.16 → 1.6.17.Gerald Combs2013-06-079-102/+25
* Build 1.6.16.wireshark-1.6.16Gerald Combs2013-06-073-28/+306
* Copy over revisions from the trunk:Gerald Combs2013-06-068-34/+106
* Copy over r49802 from the trunk:Gerald Combs2013-06-062-3/+4
* Copy over r49623 from the trunk:Gerald Combs2013-06-062-7/+64
* Copy over revisions from the trunk:Gerald Combs2013-06-043-64/+84
* [Automatic manuf, services and enterprise-numbers update for 2013-06-02]Gerald Combs2013-06-022-1120/+1203
* Add Bug 8725 (CAPWAP crash).Gerald Combs2013-05-291-10/+9
* Copy over from the trunk in order to fix https://bugs.wireshark.org/bugzilla/...Jeff Morriss2013-05-291-1/+5
* [Automatic manuf, services and enterprise-numbers update for 2013-05-26]Gerald Combs2013-05-262-13/+37
* [Automatic manuf, services and enterprise-numbers update for 2013-05-19]Gerald Combs2013-05-201-9/+23
* [Automatic manuf, services and enterprise-numbers update for 2013-05-19]Gerald Combs2013-05-201-1/+117
* Switch back to interim releases.Gerald Combs2013-05-171-6/+6
* Prep for 1.6.16.Gerald Combs2013-05-171-0/+6
* 1.6.15 → 1.6.16.Gerald Combs2013-05-179-684/+17
* Build 1.6.15.wireshark-1.6.15Gerald Combs2013-05-173-106/+606
* Copy over with manual intervention:Gerald Combs2013-05-173-19/+18
* Copy over revisions from the trunk:Jeff Morriss2013-05-161-2/+5
* Copy over revisions from the trunk:Gerald Combs2013-05-147-23/+89
* Copy over revisions from the trunk:Gerald Combs2013-05-147-12/+157
* Copy over revisions from the trunk:Gerald Combs2013-05-147-81/+106
* Copy over r48944 by hand:Gerald Combs2013-05-142-11/+12
* Copy over from trunk with manual intervention:Jeff Morriss2013-05-011-1/+1
* Whiel we're at it, copy over another fuzz-failure-generating revision fromJeff Morriss2013-04-301-3/+1
* In order to fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8617 ,Jeff Morriss2013-04-301-3/+3
* Copy over tools/fuzz-test.sh from the 1.8 branch, which includes theGerald Combs2013-04-291-15/+24
* [Automatic manuf, services and enterprise-numbers update for 2013-04-28]Gerald Combs2013-04-282-13/+76
* Copy over revisions from the trunk:Evan Huus2013-04-252-1/+38
* [Automatic manuf, services and enterprise-numbers update for 2013-04-21]Gerald Combs2013-04-212-17/+57
* Another indentation fix.Gerald Combs2013-04-152-1/+4281
* Handle recent indentation changes.Gerald Combs2013-04-152-804/+17665
* [Automatic manuf, services and enterprise-numbers update for 2013-04-14]Gerald Combs2013-04-143-23033/+2041
* [Automatic manuf, services and enterprise-numbers update for 2013-04-07]Gerald Combs2013-04-073-21/+252
* Copy over r48710 from the trunk (with manual intervention):Chris Maynard2013-04-0212-30/+30
* [Automatic manuf, services and enterprise-numbers update for 2013-03-31]Gerald Combs2013-03-318-163/+566
* Create separate PCAP_VERSION and WPD_VERSIONs similar to the trunk.Gerald Combs2013-03-192-3/+5
* [Automatic manuf, services and enterprise-numbers update for 2013-03-17]Gerald Combs2013-03-173-32/+325
* Copy over r48328 from the trunk:Gerald Combs2013-03-152-0/+2
* WinPcap 4.1.2 → 4.1.3.Gerald Combs2013-03-114-6/+6
* [Automatic manuf, services and enterprise-numbers update for 2013-03-10]Gerald Combs2013-03-103-8/+151
* Prep for 1.6.15.Gerald Combs2013-03-061-685/+9
* 1.6.14 → 1.6.15.Gerald Combs2013-03-069-244/+27
* Build 1.6.14.wireshark-1.6.14Gerald Combs2013-03-063-78/+760
* Copy over r48062 from the trunk:Gerald Combs2013-03-062-23/+34
* Manually backport more of r48011.Evan Huus2013-03-061-0/+17
* ------------------------------------------------------------------------Jaap Keuter2013-03-061-4/+9
* Copy over from trunkEvan Huus2013-03-061-3/+1
* Copy over revisions from the trunk:Gerald Combs2013-03-064-3/+11