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 /EssentialsPermissionsCommands/nbproject/project.xml | |
| 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 'EssentialsPermissionsCommands/nbproject/project.xml')
| -rw-r--r-- | EssentialsPermissionsCommands/nbproject/project.xml | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/EssentialsPermissionsCommands/nbproject/project.xml b/EssentialsPermissionsCommands/nbproject/project.xml deleted file mode 100644 index 89e773c31..000000000 --- a/EssentialsPermissionsCommands/nbproject/project.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://www.netbeans.org/ns/project/1"> - <type>org.netbeans.modules.java.j2seproject</type> - <configuration> - <data xmlns="http://www.netbeans.org/ns/j2se-project/3"> - <name>EssentialsPermissionsCommands</name> - <source-roots> - <root id="src.dir"/> - </source-roots> - <test-roots> - <root id="test.src.dir"/> - </test-roots> - </data> - <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1"> - <definitions>../lib/nblibraries.properties</definitions> - </libraries> - <references xmlns="http://www.netbeans.org/ns/ant-project-references/1"> - <reference> - <foreign-project>Essentials</foreign-project> - <artifact-type>jar</artifact-type> - <script>build.xml</script> - <target>jar</target> - <clean-target>clean</clean-target> - <id>jar</id> - </reference> - </references> - </configuration> -</project> |