jmillman 4168869291 Merge branch 'develop' into view-in-timeline ...

Conflicts:
	Core/src/org/sleuthkit/autopsy/timeline/TimeLineController.java

2016-05-12 18:11:33 -04:00

..

nbproject

Update NBM versioning for release 4.1.0

2016-03-27 16:23:33 -04:00

release

basic implementation of "View in Timeline action"

2016-04-07 16:49:11 -04:00

src/org/sleuthkit/autopsy

Merge branch 'develop' into view-in-timeline

2016-05-12 18:11:33 -04:00

autopsy-updates.xml

…

build.xml

Remove extraneous white space in build.xml for Core NBM

2016-02-25 14:37:15 -05:00

manifest.mf

Update NBM versioning for release 4.1.0

2016-03-27 16:23:33 -04:00

updates_ja.xml

…