# HG changeset patch
# User lana
# Date 1331323026 28800
# Node ID c65c291660eb4e3b72499768a71e914c5e8ad63b
# Parent  2637318c3fe0f9495c9f465323a6705308d8c4e5# Parent  0c2ac6c64d080856fe07985f53b4a686e407958c
Merge

diff -r 2637318c3fe0 -r c65c291660eb .hgignore
--- a/.hgignore	Thu Mar 08 20:34:58 2012 -0800
+++ b/.hgignore	Fri Mar 09 11:57:06 2012 -0800
@@ -5,3 +5,4 @@
 ^webrev/
 /nbproject/private/
 ^.hgtip
+.DS_Store
diff -r 2637318c3fe0 -r c65c291660eb make/jprt.properties
--- a/make/jprt.properties	Thu Mar 08 20:34:58 2012 -0800
+++ b/make/jprt.properties	Fri Mar 09 11:57:06 2012 -0800
@@ -39,6 +39,7 @@
     solaris_x64_5.10-{product|fastdebug},                       \
     linux_i586_2.6-{product|fastdebug},                         \
     linux_x64_2.6-{product|fastdebug},                          \
+    macosx_x64_10.7-{product|fastdebug},                        \
     windows_i586_5.1-{product|fastdebug},                       \
     windows_x64_5.2-{product|fastdebug}