diff options
| author | Lluis Sanchez <lluis@xamarin.com> | 2014-02-17 15:08:09 +0400 |
|---|---|---|
| committer | Lluis Sanchez <lluis@xamarin.com> | 2014-02-17 15:08:09 +0400 |
| commit | 59ab147b70767c82804b289d08b9e3c33ddf0c6d (patch) | |
| tree | b3800c6e6cc2a382205dbb9db16150b6243c67f6 /main/src/addins/CBinding/CBinding.addin.xml | |
| parent | 859db67e56993b0db6ed3fa4a1c98823aa2d2986 (diff) | |
| parent | 487298b272e36dcb64a21f6e2c57770120002fb4 (diff) | |
Merge remote-tracking branch 'origin/master' into retina
Conflicts:
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs
main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs
main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/WebReferenceFolderNodeBuilder.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
version-checks
Diffstat (limited to 'main/src/addins/CBinding/CBinding.addin.xml')
| -rw-r--r-- | main/src/addins/CBinding/CBinding.addin.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/src/addins/CBinding/CBinding.addin.xml b/main/src/addins/CBinding/CBinding.addin.xml index 70a0cad88e..59c4db45e6 100644 --- a/main/src/addins/CBinding/CBinding.addin.xml +++ b/main/src/addins/CBinding/CBinding.addin.xml @@ -239,6 +239,6 @@ </Extension> <Extension path = "/MonoDevelop/Ide/CompletionCharacters"> - <Complete id="C/C++" insertbefore="Other" insertafter="Html" language="C/C++" commitOnSpace="True" commitChars="{}[]().,:;+-*/%&|^!~=<>?@#'"\"/> + <Complete language="C/C++" commitOnSpace="True" commitChars="{}[]().,:;+-*/%&|^!~=<>?@#'"\"/> </Extension> </ExtensionModel> |