diff options
author | KHobbits <rob@khobbits.co.uk> | 2011-12-01 13:47:06 +0000 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2011-12-01 13:47:06 +0000 |
commit | f0069326393cc145c0fd21e002a8eaac1a9681d8 (patch) | |
tree | 5a22fd2e93ef9a85643e1da860a91dab493e2468 /EssentialsChat/nbproject/project.properties | |
parent | 2dc6f8c20236dfa76b09bd4bd9e522cd0d1c354b (diff) | |
parent | 39851694ad9e55e425ff7cb03c05cdb70a16f5a4 (diff) | |
download | Essentials-f0069326393cc145c0fd21e002a8eaac1a9681d8.tar Essentials-f0069326393cc145c0fd21e002a8eaac1a9681d8.tar.gz Essentials-f0069326393cc145c0fd21e002a8eaac1a9681d8.tar.lz Essentials-f0069326393cc145c0fd21e002a8eaac1a9681d8.tar.xz Essentials-f0069326393cc145c0fd21e002a8eaac1a9681d8.zip |
Merge branch 'master' of github.com:essentials/Essentials
Conflicts:
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
Essentials/src/com/earth2me/essentials/commands/Commandenchant.java
Diffstat (limited to 'EssentialsChat/nbproject/project.properties')
-rw-r--r-- | EssentialsChat/nbproject/project.properties | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/EssentialsChat/nbproject/project.properties b/EssentialsChat/nbproject/project.properties index 0ce40b48b..e59815e40 100644 --- a/EssentialsChat/nbproject/project.properties +++ b/EssentialsChat/nbproject/project.properties @@ -79,8 +79,7 @@ javac.target=1.6 javac.test.classpath=\ ${javac.classpath}:\ ${build.classes.dir}:\ - ${libs.junit.classpath}:\ - ${libs.junit_4.classpath} + ${libs.junit_4.10.classpath} javac.test.processorpath=\ ${javac.test.classpath} javadoc.additionalparam= |