diff options
| author | Lluis Sanchez <lluis@xamarin.com> | 2014-07-07 21:07:00 +0400 |
|---|---|---|
| committer | Lluis Sanchez <lluis@xamarin.com> | 2014-07-07 21:07:00 +0400 |
| commit | d80691312cd4a16ab974305053e22b828fa9d4fd (patch) | |
| tree | 1feac84654c1cc38d0022c86660118c5812f7191 /main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj | |
| parent | 0f3a1d7613829bc84e7a40ff59d47e69b0d65508 (diff) | |
| parent | da17ec30105dda70b3e07e87d4f634fab6dd265a (diff) | |
Merge remote-tracking branch 'mono/master' into xammac-2.0
Conflicts:
main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/MonoDevelop.AspNet.Mvc.csproj
main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.csproj
main/src/addins/Xml/MonoDevelop.Xml.csproj
version-checks
Diffstat (limited to 'main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj')
| -rw-r--r-- | main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj index 4da3f8747f..5816cf269e 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj @@ -117,13 +117,9 @@ <Compile Include="MonoDevelop.Debugger\DebugCommands.cs" /> <Compile Include="MonoDevelop.Debugger\Extensions.cs" /> <Compile Include="MonoDevelop.Debugger\AttachToProcessDialog.cs" /> - <Compile Include="MonoDevelop.Debugger\ExceptionsDialog.cs" /> - <Compile Include="gtk-gui\MonoDevelop.Debugger.ExceptionsDialog.cs" /> <Compile Include="gtk-gui\MonoDevelop.Debugger.AttachToProcessDialog.cs" /> <Compile Include="MonoDevelop.Debugger\ExpressionEvaluatorDialog.cs" /> <Compile Include="gtk-gui\MonoDevelop.Debugger.ExpressionEvaluatorDialog.cs" /> - <Compile Include="MonoDevelop.Debugger\BreakpointPropertiesDialog.cs" /> - <Compile Include="gtk-gui\MonoDevelop.Debugger.BreakpointPropertiesDialog.cs" /> <Compile Include="MonoDevelop.Debugger\DebugExecutionModeSet.cs" /> <Compile Include="MonoDevelop.Debugger\IDebuggerEngine.cs" /> <Compile Include="MonoDevelop.Debugger\ImmediatePad.cs" /> @@ -131,8 +127,6 @@ <Compile Include="gtk-gui\MonoDevelop.Debugger.BusyEvaluatorDialog.cs" /> <Compile Include="MonoDevelop.Debugger\DebuggerOptionsPanelWidget.cs" /> <Compile Include="gtk-gui\MonoDevelop.Debugger.DebuggerOptionsPanelWidget.cs" /> - <Compile Include="MonoDevelop.Debugger\AddTracePointDialog.cs" /> - <Compile Include="gtk-gui\MonoDevelop.Debugger.AddTracePointDialog.cs" /> <Compile Include="MonoDevelop.Debugger\PinnedWatch.cs" /> <Compile Include="MonoDevelop.Debugger\PinnedWatchStore.cs" /> <Compile Include="MonoDevelop.Debugger\DebuggerEngine.cs" /> @@ -152,6 +146,8 @@ <Compile Include="AddinInfo.cs" /> <Compile Include="MonoDevelop.Debugger\IDebuggerExpressionResolver.cs" /> <Compile Include="MonoDevelop.Debugger\DebuggerEngineBackend.cs" /> + <Compile Include="MonoDevelop.Debugger\BreakpointPropertiesDialog.cs" /> + <Compile Include="MonoDevelop.Debugger\TextEntryWithCodeCompletion.cs" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="MonoDevelop.Debugger.addin.xml"> |