Wireshark-commits: [Wireshark-commits] rev 30714: /trunk-1.2/ /trunk-1.2/epan/dissectors/: packet-e
Date: Mon, 26 Oct 2009 17:28:05 GMT
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=30714

User: gerald
Date: 2009/10/26 10:28 AM

Log:
 Copy over revisions from the trunk:
 
 ------------------------------------------------------------------------
 r30698 | gerald | 2009-10-25 13:18:24 -0700 (Sun, 25 Oct 2009) | 8 lines
 Changed paths:
    M /trunk/editcap.c
 
 From Jim Young via bug 4162:
 
 This patch limits the number of fractional digits used to calculate the
 fractional component of editcap's -t and -w options.
 
 Specifically this patch truncates the fractional component (if any) of the -t
 and -w options to 6 and 9 respectively.
 ------------------------------------------------------------------------
 r30702 | etxrab | 2009-10-25 22:55:07 -0700 (Sun, 25 Oct 2009) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-edonkey.c
 
 From Jakub Zawadzki:
 Fix memleaks while creating kademlia hash.
 ------------------------------------------------------------------------
 r30681 | gerald | 2009-10-23 14:38:38 -0700 (Fri, 23 Oct 2009) | 2 lines
 Changed paths:
    M /trunk/packaging/portableapps/win32/appinfo.tmpl
    A /trunk/packaging/portableapps/win32/installer.ini
    M /trunk/packaging/portableapps/win32/makefile.nmake
 
 Add updates from bug 4158.
 ------------------------------------------------------------------------
 r30696 | gerald | 2009-10-25 12:33:36 -0700 (Sun, 25 Oct 2009) | 2 lines
 Changed paths:
    M /trunk/packaging/portableapps/win32/Installer.nsi
    M /trunk/packaging/portableapps/win32/WiresharkPortable.nsi
 
 More fixes from John T. Haller via bug 4158, with some cleanups from me.
 ------------------------------------------------------------------------

Directory: /trunk-1.2/epan/dissectors/
  Changes    Path                Action
  +17 -44    packet-edonkey.c    Modified

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

Directory: /trunk-1.2/gtk/
  Changes    Path           Action
  +7 -0      dlg_utils.c    Modified

Directory: /trunk-1.2/
  Changes    Path          Action
  +10 -0     editcap.c     Modified

Directory: /trunk-1.2/packaging/portableapps/win32/
  Changes    Path                     Action
  +2 -2      Installer.nsi            Modified
  +2 -1      WiresharkPortable.nsi    Modified
  +6 -2      appinfo.tmpl             Modified
  +4 -1      makefile.nmake           Modified