diff options
| author | Greg Munn <greg@sgmunn.com> | 2016-10-18 18:57:21 +0300 |
|---|---|---|
| committer | Greg Munn <greg@sgmunn.com> | 2016-10-18 18:57:21 +0300 |
| commit | 9f07068217d54d098b3971c45d6f9e1d79c3ebf5 (patch) | |
| tree | 345c7c8f222ced69e9e1d91a4937c6a2aceeabc5 /.gitignore | |
| parent | 705ea57c9e2756047ae26f8978f6acfab325d68d (diff) | |
| parent | 9e7c89efac76345e672b5c5e6557b6317df1fbf4 (diff) | |
Merge branch 'master' into connected-services
# Conflicts:
# main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
# main/src/core/MonoDevelop.Core/packages.config
# version-checks
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index bc9908af72..4f63417c9e 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,7 @@ obj/ /main/tests/Ide.Tests/bin /main/src/addins/MonoDevelop.Debugger.Win32/CorApi/bin /main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/bin +/main/src/addins/MonoDevelop.Debugger.Win32/Mono.Debugging.Win32/bin/ /main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests.NonUserCodeTestLib/bin /main/src/addins/PerformanceDiagnostics/UIThreadMonitorDaemon/bin /main/src/core/MonoDevelop.Core/BuildVariables.cs |