[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2011/09/01 05:16 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r38419 | cmaynard | 2011-08-08 13:34:18 -0700 (Mon, 08 Aug 2011) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-sflow.c
 
   From Andrew Feren via bug 6219: Offset calculated incorrectly for sFlow extended data.
   ------------------------------------------------------------------------
   r38434 | morriss | 2011-08-09 12:49:08 -0700 (Tue, 09 Aug 2011) | 7 lines
   Changed paths:
      M /trunk/acinclude.m4
 
   Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5607 :
 
   When testing if we can add things to LDFLAGS, don't set LDFLAGS to CFLAGS
   if the test determines that the flag cannot be added to LDFLAGS.
 
   (Simple typo: LDFLAGS_saved was being set to CFLAGS instead of LDFLAGS.)
   ------------------------------------------------------------------------
   r38437 | morriss | 2011-08-09 14:02:10 -0700 (Tue, 09 Aug 2011) | 12 lines
   Changed paths:
      M /trunk/capinfos.c
      M /trunk/configure.in
      M /trunk/dumpcap.c
      M /trunk/editcap.c
      M /trunk/gtk/main.c
      M /trunk/mergecap.c
      M /trunk/randpkt.c
      M /trunk/rawshark.c
      M /trunk/text2pcap.c
      M /trunk/tshark.c
 
   Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5608 :
 
   getopt() can/should normally be found in unistd.h, so:
 
   - When testing for getopt(), define that we HAVE_GETOPT instead of
     HAVE_GETOPT_H (to avoid confusion).
   - Don't attempt to include getopt.h: not all OS's have it (for example,
     Solaris 9 does not).
   - (All the places which need getopt already include unistd.h (if we have it).)
 
   If this breaks things on some OS, we might need (a real) HAVE_GETOPT_H check.
   ------------------------------------------------------------------------
 
 
 Copy over by hand:
   ------------------------------------------------------------------------
   r38438 | jmayer | 2011-08-09 14:26:33 -0700 (Tue, 09 Aug 2011) | 2 lines
   Changed paths:
      M /trunk/ConfigureChecks.cmake
      M /trunk/cmakeconfig.h.in
 
   Copy over the commit 38437 to cmake.
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.6/epan/dissectors/
  Changes    Path              Action
  +3 -3      packet-sflow.c    Modified

Directory: /trunk-1.6/docbook/
  Changes    Path                 Action
  +31 -30    release-notes.xml    Modified

Directory: /trunk-1.6/gtk/
  Changes    Path          Action
  +1 -3      main.c        Modified

Directory: /trunk-1.6/
  Changes    Path                     Action
  +1 -1      ConfigureChecks.cmake    Modified
  +1 -1      acinclude.m4             Modified
  +1 -3      capinfos.c               Modified
  +1 -1      cmakeconfig.h.in         Modified
  +1 -1      configure.in             Modified
  +1 -3      dumpcap.c                Modified
  +1 -3      editcap.c                Modified
  +1 -3      mergecap.c               Modified


(4 files not shown)