autopsy-flatpak

mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-17 10:17:41 +00:00

History

jmillman 4575902791 Merge branch 'cleanup_new_clustering' into TL_quick_hide

Conflicts:
	Core/src/org/sleuthkit/autopsy/timeline/datamodel/EventBundle.java
	Core/src/org/sleuthkit/autopsy/timeline/datamodel/EventCluster.java
	Core/src/org/sleuthkit/autopsy/timeline/datamodel/EventStripe.java
	Core/src/org/sleuthkit/autopsy/timeline/datamodel/FilteredEventsModel.java
	Core/src/org/sleuthkit/autopsy/timeline/db/SQLHelper.java
	Core/src/org/sleuthkit/autopsy/timeline/filters/DescriptionFilter.java
	Core/src/org/sleuthkit/autopsy/timeline/filters/Filter.java
	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/DetailViewPane.java
	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventDetailChart.java
	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventStripeNode.java
	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/EventDescriptionTreeItem.java
	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/EventTypeTreeItem.java
	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/NavPanel.java
	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/NavTreeItem.java
	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/RootItem.java
	Core/src/org/sleuthkit/autopsy/timeline/zooming/DescriptionLOD.java
	CoreLibs/nbproject/project.xml

2015-09-30 12:57:59 -04:00

nbproject

Merge branch 'cleanup_new_clustering' into TL_quick_hide

2015-09-30 12:57:59 -04:00

src/org/sleuthkit/autopsy/corelibs

Bulk format code with new settings

2015-08-07 13:23:40 -04:00

build-mac.xml

Better integration of sigar instrumentation library. Should work on windows, linux, mac.

2013-03-07 14:31:22 -05:00

build-unix.xml

Better integration of sigar instrumentation library. Should work on windows, linux, mac.