Skip to content

Commit

Permalink
Merge with master
Browse files Browse the repository at this point in the history
  • Loading branch information
@arapte
arapte committed Feb 7, 2020
2 parents 8a48080 + 3c55a7e commit b91e423
Show file tree
Hide file tree
Showing 6,458 changed files with 252,823 additions and 155,856 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
10 changes: 5 additions & 5 deletions build.properties
View file
Expand Up @@ -39,7 +39,7 @@
jfx.release.suffix=-ea

# UPDATE THE FOLLOWING VALUES FOR A NEW RELEASE
jfx.release.major.version=14
jfx.release.major.version=15
jfx.release.minor.version=0
jfx.release.security.version=0
jfx.release.patch.version=0
Expand All @@ -56,8 +56,8 @@ jfx.release.patch.version=0

javadoc.bottom=<small><a href="http://bugreport.java.com/bugreport/">Report a bug or suggest an enhancement</a><br> Copyright &copy; 2008, 2020, Oracle and/or its affiliates. All rights reserved.</small>

javadoc.title=JavaFX 14
javadoc.header=JavaFX&nbsp;14
javadoc.title=JavaFX 15
javadoc.header=JavaFX&nbsp;15

##############################################################################
#
Expand All @@ -73,8 +73,8 @@ javadoc.header=JavaFX&nbsp;14
##############################################################################

# JDK
jfx.build.jdk.version=12
jfx.build.jdk.buildnum=33
jfx.build.jdk.version=13.0.1
jfx.build.jdk.buildnum=9
jfx.build.jdk.version.min=11
jfx.build.jdk.buildnum.min=28

Expand Down

0 comments on commit b91e423

Please sign in to comment.