github/netcore-winforms-demos
1
1
Fork 0
mirror of https://github.com/DevExpress/netcore-winforms-demos.git synced 2025-12-25 19:07:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
# Conflicts:
#	OutlookInspiredApp/DevExpress.DevAV/DevExpress.DevAV.Data/DevExpress.DevAV.Data.csproj
#	OutlookInspiredApp/DevExpress.DevAV/DevExpress.DevAV.Reports/DevExpress.DevAV.Reports.csproj
#	OutlookInspiredApp/DevExpress.OutlookInspiredApp/DevExpress.OutlookInspiredApp.csproj
This commit is contained in:
Alexander Mikhailov
2019-07-30 10:53:18 +03:00
parent 176f86865b 61c38c4754
commit 2c0b5c4787
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OutlookInspiredApp/DevExpress.OutlookInspiredApp/DevExpress.OutlookInspiredApp.csproj
View File

@@ -828,6 +828,10 @@
<EmbeddedResource Include="Resources\MailMerge\Sales Order Summary Report.snx" />
<EmbeddedResource Include="Resources\MailMerge\Welcome to DevAV.rtf" />
<EmbeddedResource Include="Resources\MailMerge\Welcome to DevAV.snx" />
<EmbeddedResource Include="Resources\MailMerge\Sales Invoice.snx" />
<EmbeddedResource Include="Resources\MailMerge\Sales Order Summary Report.snx" />
<EmbeddedResource Include="Resources\MailMerge\Welcome to DevAV.rtf" />
<EmbeddedResource Include="Resources\MailMerge\Welcome to DevAV.snx" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Buttons\glyph-backg-hover.png" />