diff options
author | KHobbits <rob@khobbits.co.uk> | 2011-07-07 04:14:50 +0100 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2011-07-07 04:14:50 +0100 |
commit | 34568ea8fc2249cc3edee9a259122b0b4316d478 (patch) | |
tree | 051f24907e9d64eb2333797b1b01dba8a661f0e4 /EssentialsChat/nbproject/project.properties | |
parent | 209a9a2f958a583b3d50dd7a60c62a3df17a8b70 (diff) | |
parent | 56a2398d9bf7bb946066006781b10360ec1997b4 (diff) | |
download | Essentials-34568ea8fc2249cc3edee9a259122b0b4316d478.tar Essentials-34568ea8fc2249cc3edee9a259122b0b4316d478.tar.gz Essentials-34568ea8fc2249cc3edee9a259122b0b4316d478.tar.lz Essentials-34568ea8fc2249cc3edee9a259122b0b4316d478.tar.xz Essentials-34568ea8fc2249cc3edee9a259122b0b4316d478.zip |
Merge branch 'master' of github.com:khobbits/Essentials
Conflicts:
Essentials/src/com/earth2me/essentials/commands/Commandhelp.java
Diffstat (limited to 'EssentialsChat/nbproject/project.properties')
-rw-r--r-- | EssentialsChat/nbproject/project.properties | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/EssentialsChat/nbproject/project.properties b/EssentialsChat/nbproject/project.properties index 08df72abc..2e51b176b 100644 --- a/EssentialsChat/nbproject/project.properties +++ b/EssentialsChat/nbproject/project.properties @@ -27,11 +27,13 @@ dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= file.reference.bukkit-0.0.1-SNAPSHOT.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar +file.reference.Factions.jar=../lib/Factions.jar includes=** jar.compress=false javac.classpath=\ ${reference.Essentials.jar}:\ - ${file.reference.bukkit-0.0.1-SNAPSHOT.jar} + ${file.reference.bukkit-0.0.1-SNAPSHOT.jar}:\ + ${file.reference.Factions.jar} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false |