Author: bodewig
Date: Wed Jul 13 13:55:43 2011
New Revision: 1146031
URL: http://svn.apache.org/viewvc?rev=1146031&view=rev
Log:
merge tracking
Modified:
ant/core/trunk/src/main/org/apache/tools/zip/ZipFile.java (props changed)
Propchange: ant/core/trunk/src/main/org/apache/tools/zip/ZipFile.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 13 13:55:43 2011
@@ -1,2 +1,2 @@
-/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java:911740
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java:911740,1146027
/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java:745920,746933,748133,748556,749342-749344,749524,749603,749855,749859
