diff options
| author | Matt Ward <matt.ward@xamarin.com> | 2015-11-19 12:43:19 +0300 |
|---|---|---|
| committer | Matt Ward <matt.ward@xamarin.com> | 2015-11-19 12:43:19 +0300 |
| commit | 3464fad275c48d7c4ffb3602dfcc66afa467b76a (patch) | |
| tree | 10db040d0a2cf55165ac8d43dd24b60ca297a887 /main/src/core/MonoDevelop.Ide/ExtensionModel/MimeTypes.addin.xml | |
| parent | d94562154c646871e5af85aeb9eca1ece86776f9 (diff) | |
| parent | 203ed0aabb6a60c7bb18f3b7b490588ab09cf38e (diff) | |
Merge branch 'master' into aspnet-project-wizard
Conflicts:
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
main/tests/UnitTests/UnitTests.csproj
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/ExtensionModel/MimeTypes.addin.xml')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/ExtensionModel/MimeTypes.addin.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/main/src/core/MonoDevelop.Ide/ExtensionModel/MimeTypes.addin.xml b/main/src/core/MonoDevelop.Ide/ExtensionModel/MimeTypes.addin.xml index 4a4bd5b95a..b27e0cb69b 100644 --- a/main/src/core/MonoDevelop.Ide/ExtensionModel/MimeTypes.addin.xml +++ b/main/src/core/MonoDevelop.Ide/ExtensionModel/MimeTypes.addin.xml @@ -67,6 +67,11 @@ <MimeType id="text/x-apple-strings" _description="Apple Strings" isText="true"> <File pattern="*.strings" /> </MimeType> + + <MimeType id="text/x-sql" _description="sql files" isText="true"> + <File pattern="*.sql" /> + </MimeType> + <MimeType id="application/json" _description="JSON files" isText="true"> <File pattern="*.json" /> </MimeType> |