William Schaefer e662e0488f 2572 resolve merge conflicts between release and agency logo branch

2017-04-20 11:39:25 -04:00

..

nbproject

Merge remote-tracking branch 'upstream/develop' into search_improvements

2017-02-27 12:37:01 -05:00

src/org/sleuthkit/autopsy

2572 resolve merge conflicts between release and agency logo branch

2017-04-20 11:39:25 -04:00

autopsy-updates.xml

…

build.xml

Merge branch '2371-minimize-installer-Core' into fix-jars-in-build

2017-04-11 15:01:05 +02:00

ivy.xml

Merge branch '2371-minimize-installer-Core' into fix-jars-in-build

2017-04-11 15:01:05 +02:00

ivysettings.xml

delete Core/release/modules on clean. Most jars downloaded with Ivy, some moved into thirdparty.

2017-03-31 15:43:40 +02:00

manifest.mf

Update NBM versioning for 4.3.0

2017-01-02 18:45:21 -05:00

updates_ja.xml

…