Ann Priestman 0be6b1c3dc Merge remote-tracking branch 'upstream/develop' into mergeTest ...

Conflicts:
	branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
	branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties

2016-11-08 13:08:58 -05:00

..

build-impl.xml

Move Logger and AutopsyPropFile into new module, CoreUtils

2012-01-06 16:29:42 -05:00

genfiles.properties

Saving before merge attempt

2014-02-19 13:11:01 -05:00

platform.properties

Remove org.netbeans.libs.javafx from diabled modules list in nbproject/platform.properties

2016-04-27 10:53:14 -04:00

platform.xml

Saving before merge attempt

2014-02-19 13:11:01 -05:00

project.properties

Merge remote-tracking branch 'upstream/develop' into mergeTest

2016-11-08 13:08:58 -05:00

project.xml

Initial import into github

2011-11-09 13:10:50 -05:00