You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by ma...@apache.org on 2018/09/19 19:24:00 UTC

ant git commit: Merge 1.9.x branch into master

Repository: ant
Updated Branches:
  refs/heads/master 790e27474 -> ec5b55d52


Merge 1.9.x branch into master


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

Branch: refs/heads/master
Commit: ec5b55d52c671a196bc92ac74f1f2bfc5c53e9f8
Parents: 790e274
Author: Maarten Coene <ma...@apache.org>
Authored: Wed Sep 19 21:23:17 2018 +0200
Committer: Maarten Coene <ma...@apache.org>
Committed: Wed Sep 19 21:23:17 2018 +0200

----------------------------------------------------------------------
 src/main/org/apache/tools/ant/Main.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/ec5b55d5/src/main/org/apache/tools/ant/Main.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/Main.java b/src/main/org/apache/tools/ant/Main.java
index a452392..4e078e0 100644
--- a/src/main/org/apache/tools/ant/Main.java
+++ b/src/main/org/apache/tools/ant/Main.java
@@ -1016,10 +1016,10 @@ public class Main implements AntMain {
         System.out.println("  -inputhandler <class>  the class which will handle input requests");
         System.out.println("  -find <file>           (s)earch for buildfile towards the root of");
         System.out.println("    -s  <file>           the filesystem and use it");
-        System.out.println("  -nice  number          A niceness value for the main thread:"
-                + "                         1 (lowest) to 10 (highest); 5 is the default");
-        System.out.println("  -nouserlib             Run ant without using the jar files from"
-                + "                         ${user.home}/.ant/lib");
+        System.out.println("  -nice  number          A niceness value for the main thread:");
+        System.out.println("                         1 (lowest) to 10 (highest); 5 is the default");
+        System.out.println("  -nouserlib             Run ant without using the jar files from");
+        System.out.println("                         ${user.home}/.ant/lib");
         System.out.println("  -noclasspath           Run ant without using CLASSPATH");
         System.out.println("  -autoproxy             Java1.5+: use the OS proxy settings");
         System.out.println("  -main <class>          override Ant's normal entry point");