Merge branch 'collaborative' of https://github.com/sleuthkit/autopsy into collaborative

This commit is contained in:
Richard Cordovano 2015-04-03 12:43:57 -04:00
commit dd91ea187d

View File

@ -12,9 +12,9 @@
<xs:element name="Examiner" type="String" nillable="true"/>
<xs:element name="CaseType" type="String" minOccurs="0" maxOccurs="1" nillable="false"/>
<xs:element name="CaseType" type="String" nillable="false"/>
<xs:element name="DatabaseName" type="String" minOccurs="0" maxOccurs="1" nillable="false"/>
<xs:element name="DatabaseName" type="String" nillable="false"/>
<xs:attribute name="Relative" type="xs:boolean"/>
@ -96,9 +96,11 @@
<xs:element ref="LogFolder"/>
<xs:element ref="TempFolder"/>
<xs:element ref="CacheFolder"/>
<xs:sequence minOccurs="0" maxOccurs="1">
<xs:element ref="CaseType"/>
<xs:element ref="DatabaseName"/>
</xs:sequence>
</xs:sequence>
</xs:complexType>
</xs:element>