changeset 290:c65c291660eb

Merge
author lana
date Fri, 09 Mar 2012 11:57:06 -0800
parents 2637318c3fe0 0c2ac6c64d08
children 6882b10e85d6
files
diffstat 2 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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}