mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2025-10-06 03:50:02 +02:00
Merge branch 'GP-0_ryanmkurtz_PR-3156_MarcMil_date'
This commit is contained in:
commit
28f2d6c875
1 changed files with 2 additions and 1 deletions
|
@ -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 {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue