Skip to content
Snippets Groups Projects
Commit 1c55964b authored by hjk's avatar hjk
Browse files

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

parents 9772ab99 484356dd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/plugins/cppeditor/CppEditor.mimetypes.xml
+ 1
− 0
View file @ 1c55964b
...@@ -133,5 +133,6 @@ ...@@ -133,5 +133,6 @@
<glob pattern="*.cxx"/> <glob pattern="*.cxx"/>
<glob pattern="*.c++"/> <glob pattern="*.c++"/>
<glob pattern="*.C"/> <glob pattern="*.C"/>
<glob pattern="*.inl"/>
</mime-type> </mime-type>
</mime-info> </mime-info>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment