Richard Cordovano f61109de19 REsolve merge conflict in Logger class

2015-09-15 18:19:28 -04:00

..

nbproject

Merge in develop and resolve conflicts

2015-08-28 13:00:50 -04:00

release

face detection feature added

2015-08-27 16:28:20 -04:00

src/org/sleuthkit/autopsy

REsolve merge conflict in Logger class

2015-09-15 18:19:28 -04:00

autopsy-updates.xml

…

build.xml

Merge in upstream/collaborative, resolve conflict

2015-08-26 15:34:53 -04:00

manifest.mf

Updated versions to 3.1.3

2015-06-18 15:41:47 -04:00

updates_ja.xml

…