changeset 346:6882b10e85d6 jdk8-b30

Merge
author katleman
date Wed, 14 Mar 2012 13:49:09 -0700
parents c65c291660eb (diff) df8e8071a413 (current diff)
children 4c41c6d0e15d
files
diffstat 2 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Mon Mar 12 16:40:38 2012 -0700
+++ b/.hgignore	Wed Mar 14 13:49:09 2012 -0700
@@ -5,3 +5,4 @@
 ^webrev/
 /nbproject/private/
 ^.hgtip
+.DS_Store
--- a/make/jprt.properties	Mon Mar 12 16:40:38 2012 -0700
+++ b/make/jprt.properties	Wed Mar 14 13:49:09 2012 -0700
@@ -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}