Raman Arora 6a404375ea Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 6516-take2-normalize-cr-account ...

# Conflicts:
#	Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepository.java

2020-07-17 07:58:19 -04:00

..

nbproject

Updated autopsy to track sleuthkit-caseuco-{TSK_VERSION}.jar

2020-07-08 11:40:48 -04:00

src/org/sleuthkit/autopsy

Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 6516-take2-normalize-cr-account

2020-07-17 07:58:19 -04:00

test

Fixed merge conflict edits.

2020-07-16 18:05:29 -04:00

autopsy-updates.xml

…

build.xml

Updated autopsy to track sleuthkit-caseuco-{TSK_VERSION}.jar

2020-07-08 11:40:48 -04:00

ivy.xml

changed jgraphx dependency and removed jitpack repository as it prompted for username and password

2020-04-06 09:57:25 -04:00

ivysettings.xml

changed jgraphx dependency and removed jitpack repository as it prompted for username and password

2020-04-06 09:57:25 -04:00

manifest.mf

Update app version number, Core NBM versioning

2020-07-06 16:20:35 -04:00

updates_ja.xml

…