Brian Sweeney 857c8b81e8 minor merge conflicts

2018-08-07 18:44:24 -06:00

..

nbproject

Merge branch 'commonfiles' of https://github.com/briangsweeney/autopsy into 3868-normalize-cr

2018-08-06 10:25:30 -06:00

src/org/sleuthkit/autopsy

minor merge conflicts

2018-08-07 18:44:24 -06:00

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

Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3868-normalize-cr

2018-08-07 17:43:27 -06:00

autopsy-updates.xml

…

build.xml

Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3868-normalize-cr

2018-08-07 17:43:27 -06:00

ivy.xml

these changes might be needed to use the apache commons validator

2018-07-31 10:49:26 -06:00

ivysettings.xml

…

manifest.mf

Module version updates for release 4.8.0

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

updates_ja.xml

…