Samuel H. Kenyon 4d31147f8f Merge remote-tracking branch 'upstream/develop' into sigid3 ...

Conflicts:
	nbproject/project.properties

2013-12-16 14:02:46 -05:00

..

nbproject

normalized line endings

2013-11-19 22:04:07 -05:00

release

Line endings.

2013-11-26 14:46:24 -05:00

src/org/sleuthkit/autopsy/recentactivity

Only add path_id attribute if is valid

2013-12-02 15:44:48 -05:00

build.xml

Recent Activity commit

2012-01-30 09:52:27 -07:00

manifest.mf

normalized line endings

2013-11-19 22:04:07 -05:00