Please cherry-pick:

[pizzaservice-war.git] / .gitignore

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