Brian Carrier 6a69f42b97 resolved conflict

2018-02-28 11:03:03 -05:00

..

nbproject

Merge pull request #3423 from raman-bt/plistviewer

2018-02-23 08:32:10 -05:00

src/org/sleuthkit/autopsy

resolved conflict

2018-02-28 11:03:03 -05:00

test/qa-functional/src/org/sleuthkit/autopsy

Delete Autopsy Core Unit test: IngestFileFiltersTest.java

2018-02-27 12:48:58 -05:00

autopsy-updates.xml

3386: Update the files permission from 755 to 644

2018-01-03 14:43:27 -05:00

build.xml

resolved conflict

2018-02-28 11:03:03 -05:00

ivy.xml

3508: File content viewer for binary PList files

2018-01-30 07:27:56 -05:00

ivysettings.xml

3386: Update the files permission from 755 to 644

2018-01-03 14:43:27 -05:00

manifest.mf

Update verson numbers for 4.6.0 release

2018-02-20 17:18:25 -05:00

updates_ja.xml

3386: Update the files permission from 755 to 644

2018-01-03 14:43:27 -05:00