Richard Cordovano 29d7fea50e Merge in upstream/collaborative, resolve conflict

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

..

nbproject

upgrade sqlite to 3.8 and change url to updates.netbeans

2015-08-26 14:46:47 -04:00

release

Merge develop->collaborative, resolve merge conflict, compile errors

2015-08-26 14:39:59 -04:00

src/org/sleuthkit/autopsy

Merge in upstream/collaborative, resolve conflict

2015-08-26 15:34:53 -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

…