millmanorama afaa098a49 Merge remote-tracking branch 'upstream/timeline-event-mgr' into 1216-drop-immutablesets
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventClusterNode.java
#	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/datamodel/EventCluster.java
#	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/datamodel/EventStripe.java
2019-04-03 13:54:38 +02:00
..