changeset 7202:39b9e9235aac 9-b16

Automated merge with ssh://jfxsrc.us.oracle.com//javafx/8u/master/jfx/rt
author kcr
date Mon, 02 Jun 2014 13:18:51 -0700
parents 3308d6a77846 c3b415272d9c
children 9c7adfd7ea09
files .hgtags
diffstat 3 files changed, 21 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Sun Jun 01 22:39:22 2014 -0700
+++ b/.hgtags	Mon Jun 02 13:18:51 2014 -0700
@@ -116,6 +116,7 @@
 ba5830260631a6812461767d1ace2b252c0f20f3 8u5-b03
 423cf238579d6106c07601f635575e4c479f5183 8.0-b123
 399f574b5ab82d850cf9c3251caa532a2a063354 8u20-m1
+4e50c1a96ca8d72346a0de0a082535c7df8beb75 9-b01
 33ba3a542f629d03d15fbe866f391959b67c6dbc 8u5-b04
 5fe28c321c0982b4afd53208531368ef84fe1998 8u5-b05
 016050dbe49b99dc19cf8f92cfb1625f80835e6e 8u5-b06
@@ -124,12 +125,15 @@
 b26eb0be433ef84f895923d170b6aad396b4e054 8.0-b126
 ab4da0281165cd1a566e7be6a608a1aa64b6e529 8.0-b127
 9eb5b65d3caa9ceb1cecae865a15f5e038eb6a3c 8.0-b128
+f07de06938aac4469a66004c70d33ec00f87c71d 9-b02
 37953435bd98584c5d7df9cbff204e413e3d2416 8u20-b01
 f965060d0af2852df8815a06e19e4a52b671b890 8u5-b07
 63bcbc815b29aa4b337e9e72b95bbd20a06acb63 8.0-b129
+56a22e779de78590a9b782b9e6230e041cd3d635 9-b03
 c76228c951d0dc98fe819a51e4b716eece6cbedf 8u20-b02
 590f14cdb1af145550ac59ca7cf65f2c257b8df2 8u20-b03
 4742b5a6eb9b846154c2089d0e65a058a58a3454 8u20-b04
+9861cccfaeccdf7bd0a6848ad9846a88745c6e03 9-b04
 96e9ffc57e1783903fa9eb90f9fb913031f97d6b 8u5-b08
 4cf678003f657d2780966ffc6b448145131d1880 8u5-b09
 c3e31d597cf5aefceb2f088bc4e9fcd295ceb001 8u5-b10
@@ -137,17 +141,28 @@
 4ef7286b926695a1baedec535d614cd634fc8828 8.0-b131
 e2fd0ac9762bd70a6db7f4a50c0c440371546ac8 8.0-b132
 f00f65d8ca59d796eaa6b796fe4b948437e6516b 8u20-b05
+f7a135396a19f0670f1e88ff8ed43a4fc5986c29 9-b05
 c7f043d40430549d9cc4ae5d4f3da42fccb14649 8u20-b06
+5c89a8fa0843f643a0a269848c3ed1ed5419e4cc 9-b06
 eee373287ad87a5604f4310fa2c714cf04909399 8u20-b07
+6c7201f0f984fc286049675b051aa44479ab579d 9-b07
 322eef9ee91216cf6904d9ef13b857b5770db5f0 8u5-b11
 32bf1d506829f6cf080c1b26208e08e76e553292 8u5-b12
 619edda5595cc54b5dd1f40131abe123ba180b04 8u5-b13
 d7e80f499365af8cca1ec29443fc9adb5aad598f 8u20-b08
+10dccb278770c2a9a77d11535118f0897d1b555f 9-b08
 4e6e6ad7ad1dc350d9590ba8c0f9ab90aa6c73e0 8u20-b09
+a3560e26f17cfbaf99e37325937079863fad2c9b 9-b09
 3438cbe3ac87e05ac434f521dec1031145b1edfd 8u20-b10
+5eb99fbc7d6dc3b195af8616cf61c911bf3b4886 9-b10
 685555d888600419d4ed90a49c5f53dd0fd51f31 8u20-b11
+2f825834e90cd5fc78c04c50c603a6c41ad975d6 9-b11
 38c1ea45f8be2fc62b9eaefc4e37a21bb394a002 8u20-b12
+98fc97b79c74a9c6fbd24df9c0e5bd0370f12d93 9-b12
 abc855ae09c05e73558e37174ae6b9c74bcb10d8 8u20-b13
+fbeee15351370bc8fbb5e45e4fa11e767348cc00 9-b13
 65e094638f34e6a59fc93a39c4ee2f4b23f80e4a 8u20-b14
+75850c2771bc8dc082343d9a9183b510d517e5be 9-b14
 674e7c021c373fe3e7a7d2a45b8cf0e7dec95c01 8u20-b15
+e0a88803a3ebdbf598c234e46b24eaa038251047 9-b15
 9425ba418764f6b82bb46bc7113760b680560381 8u20-b16
--- a/build.gradle	Sun Jun 01 22:39:22 2014 -0700
+++ b/build.gradle	Mon Jun 02 13:18:51 2014 -0700
@@ -1870,7 +1870,7 @@
             doLast {
                 mkdir "$buildDir/native"
                 exec({
-                    commandLine("$RC", "/nologo", "/l", "0x409", "/r", "/dJFX_DVERSION=8", "/dJFX_VERSION=8",
+                    commandLine("$RC", "/nologo", "/l", "0x409", "/r", "/dJFX_DVERSION=9", "/dJFX_VERSION=9",
                             "/fo$buildDir/native/javapackager/javapackager.res",
                             "src/main/native/javapackager/win/javapackager.rc");
                     environment(WINDOWS_NATIVE_COMPILE_ENVIRONMENT);
--- a/build.properties	Sun Jun 01 22:39:22 2014 -0700
+++ b/build.properties	Mon Jun 02 13:18:51 2014 -0700
@@ -33,10 +33,10 @@
 jfx.release.milestone=ea
 # Note: For fcs builds the suffix should be blank
 jfx.release.suffix=-ea
-jfx.release.name=8u20
-jfx.release.major.version=8
+jfx.release.name=9
+jfx.release.major.version=9
 jfx.release.minor.version=0
-jfx.release.micro.version=20
+jfx.release.micro.version=0
 
 ##############################################################################
 #
@@ -45,8 +45,8 @@
 ##############################################################################
 
 javadoc.bottom=<small><a href="http://docs.oracle.com/javase/8/docs/legal/cpyr.html">Copyright</a> (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.</small>
-javadoc.title=JavaFX 8
-javadoc.header=JavaFX&nbsp;8
+javadoc.title=JavaFX 9
+javadoc.header=JavaFX&nbsp;9
 
 ##############################################################################
 #