U-BASIS\dgrove 9fe9afc0d7 Resolved merge conflicts.

2018-08-03 14:43:05 -04:00

..

nbproject

Module version updates for release 4.8.0

2018-07-30 11:24:54 -04:00

src/org/sleuthkit/autopsy

Resolved merge conflicts.

2018-08-03 14:43:05 -04:00

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

Merge pull request #3931 from zhhl/3964-testZipBomb

2018-08-03 14:00:31 -04:00

autopsy-updates.xml

3386: Update the files permission from 755 to 644

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

build.xml

3964: The new vhd file includes the 2 zip bomb test files

2018-06-29 15:08:14 -04:00

ivy.xml

Merge remote-tracking branch 'upstream/develop' into cvt-graph-view

2018-03-14 16:18:47 +01:00

ivysettings.xml

Merge remote-tracking branch 'upstream/cvt-graph-view' into CVT-VisualizeTab

2018-01-09 12:04:51 +01:00

manifest.mf

Module version updates for release 4.8.0

2018-07-30 11:24:54 -04:00

updates_ja.xml

3386: Update the files permission from 755 to 644

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