bitrunner opened a new pull request, #6439: URL: https://github.com/apache/netbeans/pull/6439
This merges master into the cnd branch bringing it up to date with the changes since May 2022. 1 conflict with nbbuild/cluster.properties was resolved by taking the changes from master. 1 build error in cnd/cnd.ui/src/org/netbeans/modules/cnd/loaders/QtUiDataLoader.java due to changes to org.openide.util.MapFormat API was resolved by doing a type conversion. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
