Wireshark-commits: [Wireshark-commits] rev 33985: /trunk-1.4/ /trunk-1.4/packaging/nsis/: Makefile.

Date: Sat, 28 Aug 2010 23:02:33 GMT
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=33985

User: gerald
Date: 2010/08/28 04:02 PM

Log:
 Copy over revisions from the trunk:
 
 ------------------------------------------------------------------------
 r33921 | morriss | 2010-08-25 08:27:14 -0700 (Wed, 25 Aug 2010) | 1 line
 Changed paths:
    M /trunk/config.nmake
 
 Change PCAP_VERSION to 4.1.2.  Hopefully this will cause the U3/PortableApps builds to pick up WinPcap again.
 ------------------------------------------------------------------------
 r33922 | morriss | 2010-08-25 08:28:26 -0700 (Wed, 25 Aug 2010) | 1 line
 Changed paths:
    M /trunk/packaging/nsis/Makefile.nmake
 
 Use PCAP_VERSION (from config.nmake) instead of hard coding the WinPcap version.
 ------------------------------------------------------------------------
 
 Update win{32|64}-setup.sh

Directory: /trunk-1.4/packaging/nsis/
  Changes    Path              Action
  +1 -1      Makefile.nmake    Modified

Directory: /trunk-1.4/tools/
  Changes    Path              Action
  +1 -1      win32-setup.sh    Modified
  +1 -1      win64-setup.sh    Modified

Directory: /trunk-1.4/
  Changes    Path            Action
  +1 -1      config.nmake    Modified