subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bre...@apache.org
Subject svn commit: r1431727 - in /subversion/branches/1.7.x-r1352031: ./ get-deps.sh
Date Thu, 10 Jan 2013 23:22:37 GMT
Author: breser
Date: Thu Jan 10 23:22:37 2013
New Revision: 1431727

URL: http://svn.apache.org/viewvc?rev=1431727&view=rev
Log:
Merge r1352031 to 1.7.x-r1352031 branch while dealing with the conflict.


Modified:
    subversion/branches/1.7.x-r1352031/   (props changed)
    subversion/branches/1.7.x-r1352031/get-deps.sh

Propchange: subversion/branches/1.7.x-r1352031/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1352031

Modified: subversion/branches/1.7.x-r1352031/get-deps.sh
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1352031/get-deps.sh?rev=1431727&r1=1431726&r2=1431727&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1352031/get-deps.sh (original)
+++ subversion/branches/1.7.x-r1352031/get-deps.sh Thu Jan 10 23:22:37 2013
@@ -27,7 +27,7 @@ APR=apr-1.4.5
 APR_UTIL=apr-util-1.3.12
 NEON=neon-0.29.6
 SERF=serf-0.7.2
-ZLIB=zlib-1.2.5
+ZLIB=zlib-1.2.7
 SQLITE_VERSION=3.7.6.3
 SQLITE=sqlite-amalgamation-$(printf %d%02d%02d%02d $(echo $SQLITE_VERSION | sed -e 's/\./
/g'))
 



Mime
View raw message