summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnowleo <schneeleo@gmail.com>2011-06-07 01:23:37 +0200
committersnowleo <schneeleo@gmail.com>2011-06-07 01:23:37 +0200
commitcc18f95bc96be967246a1db58f382f7eecef4465 (patch)
tree6687879104060960b9757694962e08e2262a02ce
parent7bbb62ce505de438d6971d160ceaa3e8d2b77b2f (diff)
parent9e5c64ae9c349c27dde0ebb367c15ee9aa1e0888 (diff)
downloadEssentials-cc18f95bc96be967246a1db58f382f7eecef4465.tar
Essentials-cc18f95bc96be967246a1db58f382f7eecef4465.tar.gz
Essentials-cc18f95bc96be967246a1db58f382f7eecef4465.tar.lz
Essentials-cc18f95bc96be967246a1db58f382f7eecef4465.tar.xz
Essentials-cc18f95bc96be967246a1db58f382f7eecef4465.zip
Merge branch 'permissions3'
-rw-r--r--.gitignore4
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index fd2e7e598..2170d897b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,4 +23,6 @@
/EssentialsXMPP/build/
/EssentialsProtect/dist/
/EssentialsProtect/build/
-/EssentialsPermissionsCommands/nbproject/private/ \ No newline at end of file
+/EssentialsPermissionsCommands/nbproject/private/
+/EssentialsPermissionsCommands/build/
+/EssentialsPermissionsCommands/dist/ \ No newline at end of file