changeset 6326:56a22e779de7 9-b03

Automated merge with ssh://jfxsrc.us.oracle.com//javafx/8u/master/jfx/rt
author kcr
date Tue, 18 Feb 2014 09:33:29 -0800
parents 81b33ac8ad78 da0d5e762c4e
children 49a3b842da05
files build.gradle
diffstat 3 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Feb 17 09:46:40 2014 -0800
+++ b/.hgtags	Tue Feb 18 09:33:29 2014 -0800
@@ -113,10 +113,12 @@
 dd789066e61e601bb4e5f8cc0ec5d185d58781e4 8.0-b122
 423cf238579d6106c07601f635575e4c479f5183 8.0-b123
 399f574b5ab82d850cf9c3251caa532a2a063354 8u20-m1
+4e50c1a96ca8d72346a0de0a082535c7df8beb75 9-b01
 8d28332831a489bca04e6f9e2fdae2c0b69f11ad 8.0-b124
 3e1c456afa4cd4ada6baddafa8a22b67b39a8659 8.0-b125
 b26eb0be433ef84f895923d170b6aad396b4e054 8.0-b126
 ab4da0281165cd1a566e7be6a608a1aa64b6e529 8.0-b127
 9eb5b65d3caa9ceb1cecae865a15f5e038eb6a3c 8.0-b128
+f07de06938aac4469a66004c70d33ec00f87c71d 9-b02
 37953435bd98584c5d7df9cbff204e413e3d2416 8u20-b01
 63bcbc815b29aa4b337e9e72b95bbd20a06acb63 8.0-b129
--- a/build.gradle	Mon Feb 17 09:46:40 2014 -0800
+++ b/build.gradle	Tue Feb 18 09:33:29 2014 -0800
@@ -1731,7 +1731,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/javafxpackager/javafxpackager.res",
                             "src/main/native/javafxpackager/win/javafxpackager.rc");
                     environment(WINDOWS_NATIVE_COMPILE_ENVIRONMENT);
--- a/build.properties	Mon Feb 17 09:46:40 2014 -0800
+++ b/build.properties	Tue Feb 18 09:33:29 2014 -0800
@@ -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
 
 ##############################################################################
 #