Automated merge with https://hg.netbeans.org/main/contrib/
authorJesse Glick <jglick@netbeans.org>
Tue, 11 Jan 2011 11:16:41 -0500
changeset 17280575b919d5af3
parent 17278 681220e50d81
parent 17279 df09f27dff7e
child 17281 6937e7636868
Automated merge with https://hg.netbeans.org/main/contrib/
     1.1 --- a/ant.freeform.samples/templates/anagram/lib/build.properties	Fri Jan 07 22:35:50 2011 +0100
     1.2 +++ b/ant.freeform.samples/templates/anagram/lib/build.properties	Tue Jan 11 11:16:41 2011 -0500
     1.3 @@ -14,7 +14,7 @@
     1.4  extra.test.run.cp=
     1.5  
     1.6  # For code completion only:
     1.7 -junit.jar=${netbeans.home}/../java2/modules/ext/junit-3.8.2.jar
     1.8 +junit.jar=${netbeans.home}/../java/modules/ext/junit-3.8.2.jar
     1.9  
    1.10  run.cp=${cp}:${classes.dir}:${extra.run.cp}
    1.11  test.cp=${cp}:${classes.dir}:${junit.jar}:${extra.test.cp}
     2.1 --- a/ant.freeform.samples/templates/skeletal/build.properties	Fri Jan 07 22:35:50 2011 +0100
     2.2 +++ b/ant.freeform.samples/templates/skeletal/build.properties	Tue Jan 11 11:16:41 2011 -0500
     2.3 @@ -18,7 +18,7 @@
     2.4  # main.class=@NAME@.Main
     2.5  
     2.6  # For code completion only:
     2.7 -junit.jar=${netbeans.home}/../java2/modules/ext/junit-3.8.2.jar
     2.8 +junit.jar=${netbeans.home}/../java/modules/ext/junit-3.8.2.jar
     2.9  
    2.10  run.cp=${cp}:${classes.dir}:${extra.run.cp}
    2.11  test.cp=${cp}:${classes.dir}:${junit.jar}:${extra.test.cp}