changeset 150:89141a0869e3

Merge
author andrew
date Mon, 21 Dec 2009 12:18:23 +0000
parents e12a2cc2d9b5 a7f7276b48cd
children 754872e3368f
files .hgtags
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Fri Dec 04 15:28:25 2009 +0000
+++ b/.hgignore	Mon Dec 21 12:18:23 2009 +0000
@@ -1,3 +1,3 @@
 ^build/
 ^dist/
-^nbproject/private/
+/nbproject/private/
--- a/.hgtags	Fri Dec 04 15:28:25 2009 +0000
+++ b/.hgtags	Mon Dec 21 12:18:23 2009 +0000
@@ -52,3 +52,4 @@
 0fb137085952c8e47878e240d1cb40f14de463c4 jdk7-b75
 d728db3889da23d9f74e45154b9261a43b4acd8d icedtea7-1.12
 937144222e2219939101b0129d26a872a7956b13 jdk7-b76
+6881f0383f623394b5ec73f27a5f329ff55d0467 jdk7-b77