aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.nmake
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2012-02-02 06:54:33 +0000
committerAnders Broman <anders.broman@ericsson.com>2012-02-02 06:54:33 +0000
commit9d85c3cf85b622147bd6d728765ea39b615b1748 (patch)
tree0e43bfacd7fff61f23e852d7ccd0d496658bf42f /Makefile.nmake
parent64d6f23d83021a6eb12a81f9a781849295cd3158 (diff)
Revert file commited by mistake.
svn path=/trunk/; revision=40804
Diffstat (limited to 'Makefile.nmake')
-rw-r--r--Makefile.nmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.nmake b/Makefile.nmake
index eee573b61a..d801b9c4d8 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -846,9 +846,9 @@ process_libs:
!IFDEF ZLIB_DIR
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
!if "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
- zlib126 zlib126ws.zip
+ zlib125 zlib-1.2.5.zip
!else
- zlib126 zlib126ws.zip
+ zlib125 zlib125ws.zip
!endif
!ENDIF
!IFDEF LUA_DIR