Please cherry-pick:

[pizzaservice-war.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 4bb68df36ab24f4f21b55054b0b2304b2e77ffa6..cf4a7c5b0dae6e64df0a9d42472e823cbac70ce2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,11 @@
-/nbproject/
+nbproject/private/
+nbproject/faces-config.NavData
+nbproject/genfiles.properties
+nbproject/*~
 /manifest.mf
 /build/
 /dist/
-*.properties
-/data/*.*
+/data/*
+/*.properties
+.~lock*
+.gitcommits