ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject [2/2] ant git commit: Merge branch '1.9.x'
Date Mon, 18 Dec 2017 13:16:02 GMT
Merge branch '1.9.x'


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/33885eff
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/33885eff
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/33885eff

Branch: refs/heads/master
Commit: 33885eff5106cc9751550b7ae5a761d071da42ad
Parents: ff3faff de95b34
Author: Stefan Bodewig <bodewig@apache.org>
Authored: Mon Dec 18 14:15:51 2017 +0100
Committer: Stefan Bodewig <bodewig@apache.org>
Committed: Mon Dec 18 14:15:51 2017 +0100

----------------------------------------------------------------------
 src/main/org/apache/tools/ant/taskdefs/Zip.java   | 4 ++--
 src/main/org/apache/tools/ant/util/DateUtils.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/33885eff/src/main/org/apache/tools/ant/taskdefs/Zip.java
----------------------------------------------------------------------
diff --cc src/main/org/apache/tools/ant/taskdefs/Zip.java
index 4907953,5bcbe73..1673278
--- a/src/main/org/apache/tools/ant/taskdefs/Zip.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java
@@@ -592,12 -601,12 +592,12 @@@ public class Zip extends MatchingTask 
      /**
       * Set all stored file modification times to {@code time}.
       * @param time Milliseconds since 1970-01-01 00:00, or
-      *        <code>YYYY-MM-DD{T/ }HH:MM[:SS[.SSS]][ ][\u00b1ZZ[[:]ZZ]]</code>,
or
+      *        <code>YYYY-MM-DD{T/ }HH:MM[:SS[.SSS]][ ][&plusmn;ZZ[[:]ZZ]]</code>,
or
       *        <code>MM/DD/YYYY HH:MM[:SS] {AM/PM}</code>, where {a/b} indicates
       *        that you must choose one of a or b, and [c] indicates that you
-      *        may use or omit c. \u00b1ZZZZ is the timezone offset, and may be
+      *        may use or omit c. &plusmn;ZZZZ is the timezone offset, and may be
       *        literally "Z" to mean GMT.
 -     * @since Ant 1.9.10
 +     * @since Ant 1.10.2
       */
      public void setModificationtime(String time) {
          fixedModTime = time;

http://git-wip-us.apache.org/repos/asf/ant/blob/33885eff/src/main/org/apache/tools/ant/util/DateUtils.java
----------------------------------------------------------------------


Mime
View raw message