Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
stevemonaco committed Oct 14, 2020
2 parents ff9c3d4 + 97b0876 commit b86f294
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 0 deletions.
Binary file added TileShop.WPF/Assets/DemoImages/ApplyPalette.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added TileShop.WPF/Assets/DemoImages/Arrange.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions TileShop.WPF/TileShop.WPF.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,8 @@
</None>
</ItemGroup>

<ItemGroup>
<Folder Include="Assets\DemoImages\" />
</ItemGroup>

</Project>

0 comments on commit b86f294

Please sign in to comment.