summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb>2011-03-20 00:41:19 +0000
committersnowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb>2011-03-20 00:41:19 +0000
commitb3808f71aeb922edec54b95b5a59062015fd2f3a (patch)
treedbe334d4a1336149711b6e045ff90096f9073f65
parent59d0415c7d7c1aa1a1720734d73f9aada9c38c89 (diff)
downloadEssentials-b3808f71aeb922edec54b95b5a59062015fd2f3a.tar
Essentials-b3808f71aeb922edec54b95b5a59062015fd2f3a.tar.gz
Essentials-b3808f71aeb922edec54b95b5a59062015fd2f3a.tar.lz
Essentials-b3808f71aeb922edec54b95b5a59062015fd2f3a.tar.xz
Essentials-b3808f71aeb922edec54b95b5a59062015fd2f3a.zip
Testmerge from 2.1 to trunk
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@976 e251c2fe-e539-e718-e476-b85c1f46cddb
-rw-r--r--BuildAll/build/built-jar.properties31
-rw-r--r--BuildAll/nbproject/private/config.properties0
-rw-r--r--BuildAll/nbproject/private/private.properties6
3 files changed, 0 insertions, 37 deletions
diff --git a/BuildAll/build/built-jar.properties b/BuildAll/build/built-jar.properties
deleted file mode 100644
index a4a800fd0..000000000
--- a/BuildAll/build/built-jar.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-#Sun, 27 Feb 2011 20:29:24 -0500
-
-C\:\\Users\\Paul\\Documents\\NetBeansProjects\\essentials~svn\\BuildAll=
-
-C\:\\Users\\Paul\\Documents\\NetBeansProjects\\essentials~svn\\Essentials=
-
-C\:\\Users\\Paul\\Documents\\NetBeansProjects\\essentials~svn\\EssentialsBan=
-
-C\:\\Users\\Paul\\Documents\\NetBeansProjects\\essentials~svn\\EssentialsChat=
-
-C\:\\Users\\Paul\\Documents\\NetBeansProjects\\essentials~svn\\EssentialsEco=
-
-C\:\\Users\\Paul\\Documents\\NetBeansProjects\\essentials~svn\\EssentialsGod=
-
-C\:\\Users\\Paul\\Documents\\NetBeansProjects\\essentials~svn\\EssentialsGroupBridge=
-
-C\:\\Users\\Paul\\Documents\\NetBeansProjects\\essentials~svn\\EssentialsGroupManager=
-
-C\:\\Users\\Paul\\Documents\\NetBeansProjects\\essentials~svn\\EssentialsHelp=
-
-C\:\\Users\\Paul\\Documents\\NetBeansProjects\\essentials~svn\\EssentialsHome=
-
-C\:\\Users\\Paul\\Documents\\NetBeansProjects\\essentials~svn\\EssentialsProtect=
-
-C\:\\Users\\Paul\\Documents\\NetBeansProjects\\essentials~svn\\EssentialsServerlist=
-
-C\:\\Users\\Paul\\Documents\\NetBeansProjects\\essentials~svn\\EssentialsSpawn=
-
-C\:\\Users\\Paul\\Documents\\NetBeansProjects\\essentials~svn\\EssentialsTele=
-
-C\:\\Users\\Paul\\Documents\\NetBeansProjects\\essentials~svn\\EssentialsWarp=
diff --git a/BuildAll/nbproject/private/config.properties b/BuildAll/nbproject/private/config.properties
deleted file mode 100644
index e69de29bb..000000000
--- a/BuildAll/nbproject/private/config.properties
+++ /dev/null
diff --git a/BuildAll/nbproject/private/private.properties b/BuildAll/nbproject/private/private.properties
deleted file mode 100644
index bea25eb65..000000000
--- a/BuildAll/nbproject/private/private.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-compile.on.save=true
-do.depend=false
-do.jar=true
-javac.debug=true
-javadoc.preview=true
-user.properties.file=C:\\Users\\Paul\\.netbeans\\7.0beta2\\build.properties