changeset 2106:1143e498f813 jdk7-b78

Merge
author mikejwre
date Wed, 16 Dec 2009 23:39:21 -0800
parents be6bc681579a 447726d0daff
children e4dcfb35ee68 9956e8d71e06 31a3f28f3326
files
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Wed Dec 16 00:09:57 2009 -0800
+++ b/.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/