[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2010/03/16 04:22 PM

Log:
 Copy over revisions from the trunk:
 
 ------------------------------------------------------------------------
 r30249 | stig | 2009-10-02 09:51:31 -0700 (Fri, 02 Oct 2009) | 3 lines
 Changed paths:
    M /trunk/epan/wslua/wslua_field.c
    M /trunk/epan/wslua/wslua_tree.c
 
 From Beth via bug 4049:
 Add support for FT_BOOLEAN fields to FieldInfo and TreeItem.
 ------------------------------------------------------------------------
 r30305 | etxrab | 2009-10-04 08:49:52 -0700 (Sun, 04 Oct 2009) | 1 line
 Changed paths:
    M /trunk/gtk/io_stat.c
    M /trunk/tools/checkAPIs.pl
 
 Get rid of deprecated symblol gtk_widget_draw().
 ------------------------------------------------------------------------
 r30729 | stig | 2009-10-27 06:59:05 -0700 (Tue, 27 Oct 2009) | 2 lines
 Changed paths:
    M /trunk/gtk/io_stat.c
 
 Use correct default value in tick interval combo box.
 ------------------------------------------------------------------------
 r31032 | dimeg | 2009-11-20 08:23:18 -0800 (Fri, 20 Nov 2009) | 3 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-gsm_a_bssmap.c
 
 When decoding a Cell Identifier, curr_offset is not increased after
 reading rnc-id
 ------------------------------------------------------------------------
 r31659 | stig | 2010-01-25 05:58:07 -0800 (Mon, 25 Jan 2010) | 6 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-dmp.c
    M /trunk/epan/dissectors/packet-ldss.c
 
 Change back from tvb_child_uncompress() to tvb_uncompress() when
 parent is NULL, because this will lead to a DISSECTOR_ASSERT in 
 tvb_set_child_real_data_tvbuff().
 
 This bug was introduced in revision 31499.
 ------------------------------------------------------------------------
 r31786 | wmeier | 2010-02-04 06:41:22 -0800 (Thu, 04 Feb 2010) | 2 lines
 Changed paths:
    M /trunk/gtk/main_proto_draw.c
 
 Fix a crash which occurs if a progress bar is displayed while generating a hex bytes pane.
 ------------------------------------------------------------------------
 r31787 | wmeier | 2010-02-04 07:03:30 -0800 (Thu, 04 Feb 2010) | 2 lines
 Changed paths:
    M /trunk/gtk/main_proto_draw.c
 
 Fix a typo....
 ------------------------------------------------------------------------
 r31918 | guy | 2010-02-18 16:05:34 -0800 (Thu, 18 Feb 2010) | 2 lines
 Changed paths:
    M /trunk/configure.in
 
 There's an echo in here....
 ------------------------------------------------------------------------
 r31919 | guy | 2010-02-18 16:15:29 -0800 (Thu, 18 Feb 2010) | 3 lines
 Changed paths:
    M /trunk/acinclude.m4
 
 Don't say "Checking for broken pcap-config" if we don't have a
 pcap-config to check for brokenness.
 ------------------------------------------------------------------------
 r31978 | stig | 2010-02-24 00:22:33 -0800 (Wed, 24 Feb 2010) | 3 lines
 Changed paths:
    M /trunk/plugins/profinet/packet-dcerpc-pn-io.c
 
 From Hannes Diethelm via bug 4525:
 Corrected values for IdentInfo (which was obviously wrong)
 ------------------------------------------------------------------------
 r31985 | etxrab | 2010-02-24 04:41:01 -0800 (Wed, 24 Feb 2010) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-gsm_sms.c
 
 GSM SMS PDU TPVPF wrong interpretation.
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4524
 ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 ------------------------------------------------------------------------
 r30570 | etxrab | 2009-10-16 03:32:06 -0700 (Fri, 16 Oct 2009) | 1 line
 Changed paths:
    M /trunk/gtk/io_stat.c
 
 More gtk_option_menu -> gtk_combo_box
 ------------------------------------------------------------------------
 r31738 | jake | 2010-01-30 02:43:46 -0800 (Sat, 30 Jan 2010) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-ppp.c
    M /trunk/epan/ppptypes.h
 
 IANA updates and fixes for PPP types.
 ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.2/epan/dissectors/
  Changes    Path                     Action
  +1 -1      packet-dmp.c             Modified
  +1 -0      packet-gsm_a_bssmap.c    Modified
  +5 -4      packet-gsm_sms.c         Modified
  +1 -1      packet-ldss.c            Modified
  +4 -2      packet-ppp.c             Modified

Directory: /trunk-1.2/docbook/
  Changes    Path                 Action
  +25 -86    release-notes.xml    Modified

Directory: /trunk-1.2/epan/
  Changes    Path          Action
  +9 -7      ppptypes.h    Modified

Directory: /trunk-1.2/gtk/
  Changes    Path                 Action
  +93 -124   io_stat.c            Modified
  +21 -3     main_proto_draw.c    Modified

Directory: /trunk-1.2/plugins/profinet/
  Changes    Path                     Action
  +2 -2      packet-dcerpc-pn-io.c    Modified


(5 files not shown)