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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=783d06d108c5b37acf06c7ce5975de0ad433c40e
Submitter: Pascal Quantin (pascal.quantin@xxxxxxxxx)
Changed: branch: master-1.10
Repository: wireshark

Commits:

783d06d by Pascal Quantin (pascal.quantin@xxxxxxxxx):

    GSM RLC MAC: Do not skip too many lines of the CSN_DESCR when the field is missing
    
    While we are at it, replace an undefined hf_timeslot_allocation_usf_tn by its hf_usf equivalent
    
    Bug: 10120
    Change-Id: I3fe113279c779a9d8143d07489747a67d7351664
    Reviewed-on: https://code.wireshark.org/review/1794
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    
    Conflicts:
    	epan/dissectors/packet-gsm_rlcmac.c
    
    (cherry picked from commit c4ead251da7199cfd746d378c51eb8c30d09a6ba)
    
    Change-Id: I3e022eea6acdc5606c39da53e5c4da956d4ef89c
    Reviewed-on: https://code.wireshark.org/review/1797
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    

Actions performed:

    from  6fda9c8   [Automatic manuf, services and enterprise-numbers update for 2014-05-25]
    adds  783d06d   GSM RLC MAC: Do not skip too many lines of the CSN_DESCR when the field is missing


Summary of changes:
 docbook/release-notes.asciidoc      |    1 +
 epan/dissectors/packet-gsm_rlcmac.c |    7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)