Merge branch 'timeline_single_cluster' into TL_quick_hide

This commit is contained in:
millmanorama 2015-09-24 15:57:45 -04:00
commit 45920cb98d
2 changed files with 5 additions and 5 deletions

View File

@ -20,7 +20,7 @@ file.reference.dom4j-1.6.1.jar=release/modules/ext/dom4j-1.6.1.jar
file.reference.geronimo-jms_1.1_spec-1.0.jar=release/modules/ext/geronimo-jms_1.1_spec-1.0.jar
file.reference.gson-1.4.jar=release/modules/ext/gson-1.4.jar
file.reference.gstreamer-java-1.5.jar=release/modules/ext/gstreamer-java-1.5.jar
file.reference.guava-18.0.jar=C:\\dev\\autopsy\\CoreLibs\\release\\modules\\ext\\guava-18.0.jar
file.reference.guava-18.0.jar=release/modules/ext/guava-18.0.jar
file.reference.imageio-bmp-3.1.1.jar=release/modules/ext/imageio-bmp-3.1.1.jar
file.reference.imageio-core-3.1.1.jar=release/modules/ext/imageio-core-3.1.1.jar
file.reference.imageio-icns-3.1.1.jar=release/modules/ext/imageio-icns-3.1.1.jar

View File

@ -714,14 +714,14 @@
<runtime-relative-path>ext/imageio-pnm-3.1.1.jar</runtime-relative-path>
<binary-origin>release/modules/ext/imageio-pnm-3.1.1.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/guava-18.0.jar</runtime-relative-path>
<binary-origin>C:\dev\autopsy\CoreLibs\release\modules\ext\guava-18.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/common-lang-3.1.1.jar</runtime-relative-path>
<binary-origin>release/modules/ext/common-lang-3.1.1.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/guava-18.0.jar</runtime-relative-path>
<binary-origin>release/modules/ext/guava-18.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/slf4j-api-1.6.1.jar</runtime-relative-path>
<binary-origin>release/modules/ext/slf4j-api-1.6.1.jar</binary-origin>