diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-06-18 14:07:59 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-06-18 14:07:59 +0300 |
| commit | 247899ef27f6dec54f49876cb66c5749aa8d27fb (patch) | |
| tree | 346d89738e3ee134679f8b9340b37cdeddb867bf /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Tango.MachineStudio.DataCapture.csproj | |
| parent | 1fd773deb7bba088c5f1c13a1b9ccab85f927ddc (diff) | |
| parent | 3640afb74b3e7b3e232f56a14104866690495c9a (diff) | |
| download | Tango-247899ef27f6dec54f49876cb66c5749aa8d27fb.tar.gz Tango-247899ef27f6dec54f49876cb66c5749aa8d27fb.zip | |
conflict merge
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Tango.MachineStudio.DataCapture.csproj')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Tango.MachineStudio.DataCapture.csproj | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Tango.MachineStudio.DataCapture.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Tango.MachineStudio.DataCapture.csproj index 3d8fe79c7..004ee9bdf 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Tango.MachineStudio.DataCapture.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Tango.MachineStudio.DataCapture.csproj @@ -45,6 +45,7 @@ </Reference> <Reference Include="System" /> <Reference Include="System.Data" /> + <Reference Include="System.Drawing" /> <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <HintPath>..\..\..\packages\Expression.Blend.Sdk.1.0.2\lib\net45\System.Windows.Interactivity.dll</HintPath> </Reference> |