[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2008/06/23 11:46 AM

Log:
 Copy over revisions from the trunk:
 
 ------------------------------------------------------------------------
 r25443 | stig | 2008-06-11 13:10:19 -0700 (Wed, 11 Jun 2008) | 3 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-ms-mms.c
 
 Return 0 if we don't dissect any bytes.
 Set desegment_len = DESEGMENT_ONE_MORE_SEGMENT.
 
 ------------------------------------------------------------------------
 r25483 | stig | 2008-06-18 15:47:58 -0700 (Wed, 18 Jun 2008) | 4 lines
 Changed paths:
    M /trunk/packaging/macosx/osx-app.sh
 
 Do not overwrite existing files when copying dependencies, as this will
 overwrite the wireshark libs with libs installed in /opt/local, which is
 probably not the ones we want.
 
 ------------------------------------------------------------------------
 r25490 | ulfl | 2008-06-19 11:44:23 -0700 (Thu, 19 Jun 2008) | 1 line
 Changed paths:
    M /trunk/plugins/profinet/packet-pn-dcp.c
 
 fix BlockError strings
 ------------------------------------------------------------------------
 r25516 | stig | 2008-06-21 16:02:01 -0700 (Sat, 21 Jun 2008) | 2 lines
 Changed paths:
    M /trunk/services
 
 Update the services file from IANA's port-numbers.
 
 ------------------------------------------------------------------------
 r25517 | stig | 2008-06-21 16:07:33 -0700 (Sat, 21 Jun 2008) | 2 lines
 Changed paths:
    M /trunk/manuf
 
 Update manuf
 
 ------------------------------------------------------------------------
 r25525 | stig | 2008-06-22 11:36:33 -0700 (Sun, 22 Jun 2008) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-mgcp.c
 
 Make the MGCP dissector give away the package if it knows its not a MGCP.
 
 ------------------------------------------------------------------------
 r25526 | stig | 2008-06-22 11:42:37 -0700 (Sun, 22 Jun 2008) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-actrace.c
 
 Make the ACTRACE dissector give away the package if it knows its not a ACTRACE.
 
 ------------------------------------------------------------------------
 
 
 Copy over r25489 by hand:
 ------------------------------------------------------------------------
 r25489 | stig | 2008-06-19 10:25:34 -0700 (Thu, 19 Jun 2008) | 5 lines
 Changed paths:
    M /trunk/gtk/capture_dlg.c
 
 Make storage-based and time-based "Next file every" checkboxes behave equal
 in "Use multiple files".  Also default to storage-based if not time-based.
 
 This fixes the initial problem in bug #2599.
 
 ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.0/epan/dissectors/
  Changes    Path                Action
  +14 -14    packet-actrace.c    Modified
  +42 -34    packet-mgcp.c       Modified
  +6 -6      packet-ms-mms.c     Modified

Directory: /trunk-1.0/docbook/
  Changes    Path                 Action
  +19 -0     release-notes.xml    Modified

Directory: /trunk-1.0/gtk/
  Changes    Path             Action
  +1 -1      capture_dlg.c    Modified

Directory: /trunk-1.0/packaging/macosx/
  Changes    Path          Action
  +1 -1      osx-app.sh    Modified

Directory: /trunk-1.0/plugins/profinet/
  Changes    Path               Action
  +4 -4      packet-pn-dcp.c    Modified

Directory: /trunk-1.0/
  Changes    Path          Action
  +17 -0     manuf         Modified
  +749 -243  services      Modified