diff options
| author | Mirta <mirta@twine-s.com> | 2020-08-19 10:33:15 +0300 |
|---|---|---|
| committer | Mirta <mirta@twine-s.com> | 2020-08-19 10:33:15 +0300 |
| commit | e3bc7c2268cb25464d62dd56c7c265826c57d3c0 (patch) | |
| tree | 59ff75312959109f826bf70f2e7e82e689bba1fd /Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors.csproj | |
| parent | 7b6a64613bc18b1ce6c92fa9c335684ebaf00c90 (diff) | |
| parent | 4702a085323fc2a6b403187867f9bf8c66bf45f6 (diff) | |
| download | Tango-e3bc7c2268cb25464d62dd56c7c265826c57d3c0.tar.gz Tango-e3bc7c2268cb25464d62dd56c7c265826c57d3c0.zip | |
resolved conflicts
Diffstat (limited to 'Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors.csproj')
| -rw-r--r-- | Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors.csproj | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors.csproj b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors.csproj index a70bbf3de..11e023f86 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors.csproj +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors.csproj @@ -180,6 +180,7 @@ <Link>GlobalVersionInfo.cs</Link> </Compile> <Compile Include="AvalonEditCommands.cs" /> + <Compile Include="BreakPointSymbolPressedEventArgs.cs" /> <Compile Include="CachedAssembly.cs" /> <Compile Include="CachedUsing.cs" /> <Compile Include="CodeCompletion\CompletionListBox.cs" /> @@ -196,6 +197,7 @@ <Compile Include="CodeCompletion\OverloadViewer.cs" /> <Compile Include="Converters\BooleanToVisibilityConverter.cs" /> <Compile Include="Converters\BooleanToVisibilityInversedConverter.cs" /> + <Compile Include="Editing\BreakPointMargin.cs" /> <Compile Include="Errors\ITextMarker.cs" /> <Compile Include="Errors\TextMarkerService.cs" /> <Compile Include="ExtensionMethods.cs" /> @@ -207,6 +209,7 @@ <Compile Include="Intellisense\EventCompletionItem.cs" /> <Compile Include="Intellisense\FieldCompletionItem.cs" /> <Compile Include="Intellisense\FieldCompletionItemPopup.cs" /> + <Compile Include="Intellisense\HideIntellisenseAttribute.cs" /> <Compile Include="Intellisense\ICompletionItem.cs" /> <Compile Include="Intellisense\ICompletionProvider.cs" /> <Compile Include="Intellisense\InterfaceCompletionItem.cs" /> @@ -651,6 +654,9 @@ <ItemGroup> <Resource Include="Images\snippet.png" /> </ItemGroup> + <ItemGroup> + <Resource Include="Images\break_point_arrow.png" /> + </ItemGroup> <ProjectExtensions> <VisualStudio> <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UseGlobalSettings="True" /> |