[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2007/06/27 09:45 PM

Log:
 Remove a duplicate entry in the release notes.  Copy over revisions
 22171, 22186, 22188, 22195, 22198, 22210, and 22211 from the trunk.
 
 ------------------------------------------------------------------------
 r22171 | etxrab | 2007-06-23 08:31:37 -0700 (Sat, 23 Jun 2007) | 1 line
 Changed paths:
    M /trunk/epan/dissectors/packet-ber.c
 
 Fix a typo.
 ------------------------------------------------------------------------
 r22186 | gerald | 2007-06-25 11:22:36 -0700 (Mon, 25 Jun 2007) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-eapol.c
 
 Fix logic to properly ignore (for now) encrypted keys and group keys.
 
 ------------------------------------------------------------------------
 r22188 | sfisher | 2007-06-25 11:59:43 -0700 (Mon, 25 Jun 2007) | 6 lines
 Changed paths:
    M /trunk/capture_opts.c
 
 
 Fix bug #1665 / From Nikns Siankin:
 
 Fix compilation on OpenBSD.  This needs to go into 0.99.6 release.
 ------------------------------------------------------------------------
 r22195 | gerald | 2007-06-26 12:38:44 -0700 (Tue, 26 Jun 2007) | 2 lines
 Changed paths:
    M /trunk/capture_info.c
    M /trunk/epan/dissectors/packet-ppi.c
    A /trunk/epan/dissectors/packet-ppi.h
    M /trunk/epan/libwireshark.def
 
 Add capture counts for PPI.
 ------------------------------------------------------------------------
 r22198 | gerald | 2007-06-26 22:39:13 -0700 (Tue, 26 Jun 2007) | 3 lines
 Changed paths:
    M /trunk/gtk/export_object.c
 
 If we have problems with "Save All" in the HTTP object list, show a single
 error dialog instead of one dialog per unsaved file.
 ------------------------------------------------------------------------
 r22210 | gerald | 2007-06-27 12:02:58 -0700 (Wed, 27 Jun 2007) | 3 lines
 Changed paths:
    M /trunk/epan/crypt/airpdcap.c
 
 Make the WPA passphrase a percent-escaped string.  Constify and GLib-ize
 some variables.
 ------------------------------------------------------------------------
 r22211 | gerald | 2007-06-27 14:03:25 -0700 (Wed, 27 Jun 2007) | 4 lines
 Changed paths:
    M /trunk/gtk/airpcap_dlg.c
 
 In the wireless key management dialog, apply the 802.11 preferences when
 the "OK," "Apply," or "Cancel" buttons are pressed.  Remove some duplicate
 code.  Add a comment about "Cancel" not working as expected.
 ------------------------------------------------------------------------

Directory: /trunk-0.99.6/epan/crypt/
  Changes    Path          Action
  +16 -9     airpdcap.c    Modified

Directory: /trunk-0.99.6/epan/dissectors/
  Changes    Path              Action
  +1 -1      packet-ber.c      Modified
  +5 -3      packet-eapol.c    Modified
  +43 -4     packet-ppi.c      Modified

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

Directory: /trunk-0.99.6/epan/
  Changes    Path                Action
  +1 -0      libwireshark.def    Modified

Directory: /trunk-0.99.6/gtk/
  Changes    Path               Action
  +12 -45    airpcap_dlg.c      Modified
  +26 -16    export_object.c    Modified

Directory: /trunk-0.99.6/
  Changes    Path              Action
  +4 -0      capture_info.c    Modified
  +4 -0      capture_opts.c    Modified