Merge
authormikejwre
Wed, 16 Dec 2009 23:39:21 -0800
changeset 4398 97c33ee30c4f
parent 4396 d78c0cb4baf7 (current diff)
parent 4397 05cfc8c7552f (diff)
child 4399 41e7e6e5c24f
Merge
--- a/jdk/.hgignore	Wed Dec 16 00:09:57 2009 -0800
+++ b/jdk/.hgignore	Wed Dec 16 23:39:21 2009 -0800
@@ -1,6 +1,5 @@
 ^build/
 ^dist/
-^nbproject/private/
-^make/netbeans/.*/nbproject/private/
+/nbproject/private/
 ^make/netbeans/.*/build/
 ^make/netbeans/.*/dist/