Author: breser
Date: Thu Mar 28 23:35:41 2013
New Revision: 1462351
URL: http://svn.apache.org/r1462351
Log:
Merge r1352031 under obvious fix rule (zlib 1.2.5 is not available for download)
Modified:
subversion/branches/1.6.x/ (props changed)
subversion/branches/1.6.x/get-deps.sh (contents, props changed)
Propchange: subversion/branches/1.6.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1352031
Modified: subversion/branches/1.6.x/get-deps.sh
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x/get-deps.sh?rev=1462351&r1=1462350&r2=1462351&view=diff
==============================================================================
--- subversion/branches/1.6.x/get-deps.sh (original)
+++ subversion/branches/1.6.x/get-deps.sh Thu Mar 28 23:35:41 2013
@@ -27,7 +27,7 @@ APR=apr-1.4.4
APR_UTIL=apr-util-1.3.11
NEON=neon-0.28.3
SERF=serf-0.7.0
-ZLIB=zlib-1.2.5
+ZLIB=zlib-1.2.7
SQLITE_VERSION=3.7.5.0
SQLITE=sqlite-amalgamation-$(printf %u%02u%02u%02u $(echo $SQLITE_VERSION |
sed -e "s/\./ /g"))
Propchange: subversion/branches/1.6.x/get-deps.sh
------------------------------------------------------------------------------
Merged /subversion/trunk/get-deps.sh:r1352031
