Merge
authorlana
Fri, 09 Mar 2012 11:57:06 -0800
changeset 12070 1be156c4b73b
parent 12067 01093937af5f (current diff)
parent 12069 23b63446cf2c (diff)
child 12073 75a5a7153772
Merge
--- a/jaxws/.hgignore	Thu Mar 08 20:34:58 2012 -0800
+++ b/jaxws/.hgignore	Fri Mar 09 11:57:06 2012 -0800
@@ -5,3 +5,4 @@
 ^webrev/
 /nbproject/private/
 ^.hgtip
+.DS_Store
--- a/jaxws/make/jprt.properties	Thu Mar 08 20:34:58 2012 -0800
+++ b/jaxws/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}