Merge

Fri, 09 Mar 2012 11:57:06 -0800

author
lana
date
Fri, 09 Mar 2012 11:57:06 -0800
changeset 291
c65c291660eb
parent 288
2637318c3fe0
parent 290
0c2ac6c64d08
child 294
6882b10e85d6

Merge

     1.1 --- a/.hgignore	Thu Mar 08 20:34:58 2012 -0800
     1.2 +++ b/.hgignore	Fri Mar 09 11:57:06 2012 -0800
     1.3 @@ -5,3 +5,4 @@
     1.4  ^webrev/
     1.5  /nbproject/private/
     1.6  ^.hgtip
     1.7 +.DS_Store
     2.1 --- a/make/jprt.properties	Thu Mar 08 20:34:58 2012 -0800
     2.2 +++ b/make/jprt.properties	Fri Mar 09 11:57:06 2012 -0800
     2.3 @@ -39,6 +39,7 @@
     2.4      solaris_x64_5.10-{product|fastdebug},                       \
     2.5      linux_i586_2.6-{product|fastdebug},                         \
     2.6      linux_x64_2.6-{product|fastdebug},                          \
     2.7 +    macosx_x64_10.7-{product|fastdebug},                        \
     2.8      windows_i586_5.1-{product|fastdebug},                       \
     2.9      windows_x64_5.2-{product|fastdebug}
    2.10  

mercurial