jmillman 2fcd19ba69 Merge branch 'advanced_timeline' into timeline_and_image_analyzer ...

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
	nbproject/project.properties

2014-08-25 14:51:25 -04: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

Updated build process to build from intermediate step, reduce 32/64-bit paths, and let AI make the GUID for jre8

2014-05-15 16:02:27 -04:00

platform.xml

Saving before merge attempt

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

project.properties

Merge branch 'advanced_timeline' into timeline_and_image_analyzer

2014-08-25 14:51:25 -04:00

project.xml

Initial import into github

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