diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-07-12 16:30:36 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-07-12 16:30:36 +0300 |
| commit | 04bc3b7e0070ed810ce2255f944f1caa87b03d52 (patch) | |
| tree | 1c6141cf42d9ce94cd837bda7bff05014049a09a /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj | |
| parent | 0de74a76e7002a1b960c3fa68f8b4cd530865e15 (diff) | |
| parent | bd695634133b6e5683b7aae50f8a1df96be54b1a (diff) | |
| download | Tango-04bc3b7e0070ed810ce2255f944f1caa87b03d52.tar.gz Tango-04bc3b7e0070ed810ce2255f944f1caa87b03d52.zip | |
merge conflicts
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj index 706243ee1..2ce0446aa 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj @@ -74,6 +74,7 @@ <Compile Include="Controls\TimeRuler.cs" /> <Compile Include="Converters\DateIsInListToBooleanConverter.cs" /> <Compile Include="Converters\EventsToTimeRulerTicksConverter.cs" /> + <Compile Include="Converters\LogItemToMessageConverter.cs" /> <Compile Include="Converters\MachineEventToXConverter.cs" /> <Compile Include="Converters\SecondsToWidthConverter.cs" /> <Compile Include="Converters\StringToFirstLineConverter.cs" /> |