copy changes from develop

This commit is contained in:
Alex Fabijanic
2018-02-02 12:24:16 -06:00
parent 6fa4fda1e4
commit aaf14a0e93
35 changed files with 2376 additions and 238 deletions

View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">