Integrated: Merge jfx20
Kevin Rushforth
kcr at openjdk.org
Tue Feb 28 23:20:16 UTC 2023
On Tue, 28 Feb 2023 23:11:33 GMT, Kevin Rushforth <kcr at openjdk.org> wrote:
> Merge `jfx20` into `master`. I fixed the expected merge conflict in `.jcheck/conf` by keeping the version from `master`, so that the JBS fix version correctly remains at `jfx21` in the `master` branch. Since the fix for JDK-8302470 was the only fix brought forward from `jfx20`, the next effect of this Merge is: no change to `master`. The only reason I am even doing this is to make the next time I do a sync easier.
This pull request has now been integrated.
Changeset: 00f1aca3
Author: Kevin Rushforth <kcr at openjdk.org>
URL: https://git.openjdk.org/jfx/commit/00f1aca31984b2895ceafce8aa5e61f6fba9eb0c
Stats: 0 lines in 0 files changed: 0 ins; 0 del; 0 mod
Merge
-------------
PR: https://git.openjdk.org/jfx/pull/1051
More information about the openjfx-dev
mailing list