Merge jdk7-b78
authormikejwre
Wed, 16 Dec 2009 23:39:21 -0800
changeset 20361143e498f813
parent 2034 be6bc681579a
parent 2035 447726d0daff
child 2037 e4dcfb35ee68
child 2077 9956e8d71e06
child 2159 31a3f28f3326
Merge
     1.1 --- a/.hgignore	Wed Dec 16 00:09:57 2009 -0800
     1.2 +++ b/.hgignore	Wed Dec 16 23:39:21 2009 -0800
     1.3 @@ -1,6 +1,5 @@
     1.4  ^build/
     1.5  ^dist/
     1.6 -^nbproject/private/
     1.7 -^make/netbeans/.*/nbproject/private/
     1.8 +/nbproject/private/
     1.9  ^make/netbeans/.*/build/
    1.10  ^make/netbeans/.*/dist/