OpenJDK / openjfx / jfx-dev / rt
changeset 6593:6c7201f0f984 9-b07
Automated merge with ssh://jfxsrc.us.oracle.com//javafx/8u/master/jfx/rt
| author | kcr |
|---|---|
| date | Mon, 31 Mar 2014 15:41:34 -0700 |
| parents | d7e80f499365 6ef66297a918 |
| children | 7dcdac720561 |
| files | .hgtags build.gradle |
| diffstat | 3 files changed, 12 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Mar 28 17:00:45 2014 -0700 +++ b/.hgtags Mon Mar 31 15:41:34 2014 -0700 @@ -113,19 +113,25 @@ 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 +56a22e779de78590a9b782b9e6230e041cd3d635 9-b03 c76228c951d0dc98fe819a51e4b716eece6cbedf 8u20-b02 590f14cdb1af145550ac59ca7cf65f2c257b8df2 8u20-b03 4742b5a6eb9b846154c2089d0e65a058a58a3454 8u20-b04 +9861cccfaeccdf7bd0a6848ad9846a88745c6e03 9-b04 b8d6295f467255c28b71962f24d8281a3a8d0f71 8.0-b130 4ef7286b926695a1baedec535d614cd634fc8828 8.0-b131 e2fd0ac9762bd70a6db7f4a50c0c440371546ac8 8.0-b132 f00f65d8ca59d796eaa6b796fe4b948437e6516b 8u20-b05 +f7a135396a19f0670f1e88ff8ed43a4fc5986c29 9-b05 c7f043d40430549d9cc4ae5d4f3da42fccb14649 8u20-b06 +5c89a8fa0843f643a0a269848c3ed1ed5419e4cc 9-b06 eee373287ad87a5604f4310fa2c714cf04909399 8u20-b07
--- a/build.gradle Fri Mar 28 17:00:45 2014 -0700 +++ b/build.gradle Mon Mar 31 15:41:34 2014 -0700 @@ -1812,7 +1812,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 Fri Mar 28 17:00:45 2014 -0700 +++ b/build.properties Mon Mar 31 15:41:34 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 8 +javadoc.title=JavaFX 9 +javadoc.header=JavaFX 9 ############################################################################## #