Merge branch 'jay' into vigem-udpserver

This commit is contained in:
Travis Nickles 2018-10-16 23:35:02 -05:00
commit af33a6a294

View File

@ -17,9 +17,11 @@ using System.Drawing.Drawing2D;
using TaskRunner = System.Threading.Tasks.Task; using TaskRunner = System.Threading.Tasks.Task;
using NonFormTimer = System.Timers.Timer; using NonFormTimer = System.Timers.Timer;
using static DS4Windows.Global; using static DS4Windows.Global;
using System.Security;
namespace DS4Windows namespace DS4Windows
{ {
[SuppressUnmanagedCodeSecurity]
public partial class DS4Form : Form public partial class DS4Form : Form
{ {
public string[] cmdArguments; public string[] cmdArguments;