Merge branch 'GP-0_ryanmkurtz_PR-3156_MarcMil_date'

This commit is contained in:
Ryan Kurtz 2022-07-01 01:32:28 -04:00
commit 28f2d6c875

View file

@ -17,6 +17,7 @@ package ghidra.program.model.data;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
import java.util.TimeZone;
import ghidra.docking.settings.Settings;
@ -35,7 +36,7 @@ public class MacintoshTimeStampDataType extends BuiltIn {
MacintoshTimeStampDataType.class.getName());
}
private final static SimpleDateFormat formatter = new SimpleDateFormat("dd-MMM-yyyy HH:mm:ss");
private final static SimpleDateFormat formatter = new SimpleDateFormat("dd-MMM-yyyy HH:mm:ss", Locale.US);
private static Date macStartDate;
static {