Merge branch 'jay' into ds4emulate

This commit is contained in:
Travis Nickles 2019-04-20 00:53:13 -05:00
commit 9c25413e73
4 changed files with 3 additions and 3 deletions

View File

@ -33,7 +33,7 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.7.4")] [assembly: AssemblyVersion("1.7.5")]
[assembly: AssemblyFileVersion("1.7.4")] [assembly: AssemblyFileVersion("1.7.5")]
[assembly: NeutralResourcesLanguage("en")] [assembly: NeutralResourcesLanguage("en")]

View File

@ -1 +1 @@
1.7.4 1.7.5