millmanorama 5fdf70cf08 Merge remote-tracking branch 'upstream/develop' into 1659-sort-thumbnailviewer ...

# Conflicts:
#	Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java

2017-05-12 16:34:21 +02:00

..

nbproject

Merge pull request #2784 from dgrove727/2561_POITikaJARVersionUpdates

2017-05-05 10:55:08 -04:00

src/org/sleuthkit/autopsy

Merge remote-tracking branch 'upstream/develop' into 1659-sort-thumbnailviewer

2017-05-12 16:34:21 +02: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

Updated JAR versions, and fixed compatibility issues.

2017-05-04 14:58:17 -04: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

…