Brian Sweeney 2541927897 Merge branch 'commonfiles' of https://github.com/briangsweeney/autopsy into 3868-normalize-cr ...

# Conflicts:
#	Core/nbproject/project.xml
#	Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java
#	Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/EamArtifactUtil.java

2018-08-06 10:25:30 -06:00

..

build-impl.xml

3386: Update the files permission from 755 to 644

2018-01-03 14:43:27 -05:00

platform.properties

3386: Update the files permission from 755 to 644

2018-01-03 14:43:27 -05:00

project.properties

Merge branch 'commonfiles' of https://github.com/briangsweeney/autopsy into 3868-normalize-cr

2018-08-06 10:25:30 -06:00

project.xml

Merge branch 'commonfiles' of https://github.com/briangsweeney/autopsy into 3868-normalize-cr

2018-08-06 10:25:30 -06:00

suite.properties

3386: Update the files permission from 755 to 644

2018-01-03 14:43:27 -05:00