[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2011/10/26 03:46 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r36246 | stig | 2011-03-22 04:40:15 -0700 (Tue, 22 Mar 2011) | 4 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ssl-utils.c
 
   Close fp in error case in ssl_parse_key_list to avoid leakage.
 
   Coverity 597.
   ------------------------------------------------------------------------
   r38977 | wmeier | 2011-09-12 08:44:45 -0700 (Mon, 12 Sep 2011) | 4 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-bacapp.c
 
   From Danny Breton: Property name time-synchronization-interval(204) is incorrectly shown as time-synchronization-recipents.
 
   See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6336
   ------------------------------------------------------------------------
   r39061 | cmaynard | 2011-09-20 09:28:21 -0700 (Tue, 20 Sep 2011) | 3 lines
   Changed paths:
      M /trunk/gtk/export_object.c
 
   From DeCount via bug 6362: Increase maximum allowable number of duplicate filesi from 10 to 1000.  I modified his patch to avoid appending anything to the first filename, and other minor changes.
   Reference: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6362
   ------------------------------------------------------------------------
   r39062 | cmaynard | 2011-09-20 09:42:22 -0700 (Tue, 20 Sep 2011) | 2 lines
   Changed paths:
      M /trunk/AUTHORS
 
   Add DeCount for his contribution in bug 6362.
   ------------------------------------------------------------------------
   r39080 | cmaynard | 2011-09-21 10:41:12 -0700 (Wed, 21 Sep 2011) | 2 lines
   Changed paths:
      M /trunk/gtk/export_object.c
 
   Don't pop up an error dialog box for every file that can't be saved.  Before, this could have potentially meant having to manually close far too many of them.
   ------------------------------------------------------------------------
   r39213 | stig | 2011-10-02 06:39:15 -0700 (Sun, 02 Oct 2011) | 1 line
   Changed paths:
      M /trunk/gtk/about_dlg.c
 
   Always update splash screen when action has changed.
   ------------------------------------------------------------------------
   r39214 | stig | 2011-10-02 06:39:35 -0700 (Sun, 02 Oct 2011) | 2 lines
   Changed paths:
      M /trunk/epan/epan.c
      M /trunk/epan/wslua/init_wslua.c
      M /trunk/epan/wslua/wslua.h
      M /trunk/gtk/about_dlg.c
      M /trunk/register.h
 
   Added register action for loading Lua plugins.
   Removed an unused argument to wslua_init().
   ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 
   ------------------------------------------------------------------------
   r38948 | cmaynard | 2011-09-08 19:11:53 -0700 (Thu, 08 Sep 2011) | 3 lines
   Changed paths:
      M /trunk/gtk/conversations_table.c
 
   Fix locale problem with "Rel Start" time, both with display and copy to CSV, by replacing rel_time_to_secs_str() with nstime_to_sec().  Problem reported on ask by packethunter.
   Ref: http://ask.wireshark.org/questions/6207/decimal-point-vs-decimal-comma
   ------------------------------------------------------------------------
   r38967 | etxrab | 2011-09-11 12:54:11 -0700 (Sun, 11 Sep 2011) | 4 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-dtn.c
 
   From Michael Mann:
   Extend 64-bit SDNV decoding to Administrative Records.
 
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4109
   ------------------------------------------------------------------------
   r39017 | etxrab | 2011-09-15 13:02:19 -0700 (Thu, 15 Sep 2011) | 4 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-per.c
 
   From Pascal Quantin:
   Incorrect decoding of BIT STRING type
 
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6347
   ------------------------------------------------------------------------
   r39031 | cmaynard | 2011-09-16 20:58:41 -0700 (Fri, 16 Sep 2011) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-pcep.c
 
   Update sub-object types of XRO to match RFC 5521.  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3778.
   ------------------------------------------------------------------------
   r39221 | stig | 2011-10-02 09:19:55 -0700 (Sun, 02 Oct 2011) | 6 lines
   Changed paths:
      M /trunk/epan/proto.c
      M /trunk/epan/wspython/wspy_register.c
      M /trunk/epan/wspython/wspy_register.h
      M /trunk/gtk/about_dlg.c
      M /trunk/register.h
 
   Removed the protocol registration updates in the splash screen for Python
   dissectors, because it does not work as expected and causes an assert.
 
   Added generic splash updates for python register and handoff instead.
 
   This should fix bug 5431.
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.4/epan/dissectors/
  Changes    Path                  Action
  +1 -1      packet-bacapp.c       Modified
  +52 -21    packet-dtn.c          Modified
  +3 -3      packet-ieee80211.c    Modified
  +119 -121  packet-pcep.c         Modified
  +17 -30    packet-per.c          Modified
  +1 -0      packet-ssl-utils.c    Modified

Directory: /trunk-1.4/docbook/
  Changes    Path                 Action
  +45 -1     release-notes.xml    Modified

Directory: /trunk-1.4/epan/
  Changes    Path          Action
  +1 -1      epan.c        Modified
  +6 -2      proto.c       Modified

Directory: /trunk-1.4/gtk/
  Changes    Path                     Action
  +18 -2     about_dlg.c              Modified
  +31 -36    conversations_table.c    Modified


(7 files not shown)