[gerald@xxxxxxxxxxxxx]

http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=50704

User: gerald
Date: 2013/07/17 12:24 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r49991 | eapache | 2013-06-17 15:22:17 -0700 (Mon, 17 Jun 2013) | 8 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-llrp.c
 
   Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8809
 
   The LLRP Standard 1.0.1 defines the ProtocolID Parameter as 8 bit value (see
   LLRP Standard 1.0.1 document, page 138, AccessSpecParameter) but Wireshark
   treats it as 16 bit value and therefore doesn't recognize the
   EPCGlobalClass1Gen2 protocol type and marks the whole packet afterwards as
   invalid.
   ------------------------------------------------------------------------
   r50049 | morriss | 2013-06-19 11:38:41 -0700 (Wed, 19 Jun 2013) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-diameter_3gpp.c
 
   One of the unused hf's commented out in r47389 was not used due to a
   cut-n-pasteo.  Fix that cut-n-pasteo and reinstate the hf.
   ------------------------------------------------------------------------
   r50064 | martinm | 2013-06-19 15:57:39 -0700 (Wed, 19 Jun 2013) | 2 lines
   Changed paths:
      M /trunk/ui/gtk/voip_calls_dlg.c
 
   Fix for bug 6090.  Clear the list store when resetting the dialog.
   ------------------------------------------------------------------------
   r50125 | cmaynard | 2013-06-24 07:30:00 -0700 (Mon, 24 Jun 2013) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ieee802154.c
 
   Display RSSI in dB instead of dBm.  Fixes the last remaining issue reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4507
   #BACKPORT(1.10,1.8)
   ------------------------------------------------------------------------
   r50127 | guy | 2013-06-24 12:00:55 -0700 (Mon, 24 Jun 2013) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-eth.c
 
   The Ethernet FCS is 32 bits, not 16 bits.
   ------------------------------------------------------------------------
   r50128 | cmaynard | 2013-06-24 12:27:47 -0700 (Mon, 24 Jun 2013) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-eth.c
 
   A follow-up to r50127 to highlight the correct 4 bytes of the Ethernet FCS for the hf_eth_fcs_good and hf_eth_fcs_bad fields.
   ------------------------------------------------------------------------
   r50145 | mmann | 2013-06-25 12:32:39 -0700 (Tue, 25 Jun 2013) | 9 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-iec104.c
 
   Bugfix iec104 dissector, bug 8849 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8849)
 
   From Jiří Engelthaler
 
   1) Wrong bits definitions for SIQ.BL, SIQ.SB, SIQ.NT, SIQ.IV, QDS.BL, QDS.SB, QDS.NT, QDS.IV
   2) Invalid field abbrev for VTI Transient
   3) Wrong bit size for SCO.QU, DCO.QU, RCO.QU
   4) Changes from BASE_DEC to BASE_HEX
   5) Several code style changes
   ------------------------------------------------------------------------
   r50151 | pascal | 2013-06-25 14:05:28 -0700 (Tue, 25 Jun 2013) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ansi_637.c
 
   From Reinhard Speyerer via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8851:
   ansi_637_tele dissector displays MSB as MBS for Call-Back Number
   ------------------------------------------------------------------------
 
 Update the release notes.

Directory: /trunk-1.10/epan/dissectors/
  Changes    Path                      Action
  +1 -1      packet-ansi_637.c         Modified
  +2 -4      packet-diameter_3gpp.c    Modified
  +13 -13    packet-eth.c              Modified
  +32 -39    packet-iec104.c           Modified
  +1 -1      packet-ieee802154.c       Modified
  +2 -2      packet-llrp.c             Modified

Directory: /trunk-1.10/docbook/
  Changes    Path                      Action
  +17 -0     release-notes.asciidoc    Modified

Directory: /trunk-1.10/ui/gtk/
  Changes    Path                Action
  +5 -0      voip_calls_dlg.c    Modified