merge stashed changes
This commit is contained in:
parent
1b590d7547
commit
d8b75962c5
@ -217,6 +217,11 @@
|
||||
<Compile Include="DataFormats\Package\OpenDocument\Internal\ManifestXML\ManifestXMLObjectModel.cs" />
|
||||
<Compile Include="DataFormats\Package\OpenDocument\Internal\ManifestXML\ManifestFileEntry.cs" />
|
||||
<Compile Include="DataFormats\Package\OpenDocument\Internal\ManifestXML\XMLSchemas.cs" />
|
||||
<Compile Include="DataFormats\SymbolicExpressions\SymbolicExpressionsDataFormat.cs" />
|
||||
<Compile Include="ObjectModels\SymbolicExpressions\SymbolicExpressionsObjectModel.cs" />
|
||||
<Compile Include="ObjectModels\SymbolicExpressions\ListExpression.cs" />
|
||||
<Compile Include="ObjectModels\SymbolicExpressions\LiteralExpression.cs" />
|
||||
<Compile Include="ObjectModels\SymbolicExpressions\SymbolicExpression.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\UniversalEditor.Core\UniversalEditor.Core.csproj">
|
||||
@ -262,9 +267,12 @@
|
||||
<Folder Include="DataFormats\BinaryGrammar\WxHexEditor\" />
|
||||
<Folder Include="DataFormats\Package\OpenDocument\Internal\" />
|
||||
<Folder Include="DataFormats\Package\OpenDocument\Internal\ManifestXML\" />
|
||||
<Folder Include="DataFormats\SymbolicExpressions\" />
|
||||
<Folder Include="ObjectModels\SymbolicExpressions\" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="Associations\PlainText.uexml" />
|
||||
<EmbeddedResource Include="Associations\SymbolicExpressions.uexml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="ObjectModels\Chunked\RIFFMetadata.cs">
|
||||
|
||||
@ -139,6 +139,7 @@
|
||||
<Compile Include="MultipleDocumentErrorHandling.cs" />
|
||||
<Compile Include="Editors\PropertyList\PropertyListSelection.cs" />
|
||||
<Compile Include="SettingsGuids.cs" />
|
||||
<Compile Include="Editors\SymbolicExpressions\SymbolicExpressionsEditor.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
|
||||
@ -198,6 +199,7 @@
|
||||
<Folder Include="PrintHandlers\" />
|
||||
<Folder Include="SettingsProviders\" />
|
||||
<Folder Include="Editors\Database\Dialogs\" />
|
||||
<Folder Include="Editors\SymbolicExpressions\" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="SettingsProviders\DefaultSettingsProvider.xml" />
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user