Merge branch 'jay' into vigem-udpserver

This commit is contained in:
Travis Nickles 2018-10-18 02:24:23 -05:00
commit fba091d2d1

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.5.11")] [assembly: AssemblyVersion("1.5.12")]
[assembly: AssemblyFileVersion("1.5.11")] [assembly: AssemblyFileVersion("1.5.12")]
[assembly: NeutralResourcesLanguage("en")] [assembly: NeutralResourcesLanguage("en")]