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

2009-01-27 17:16:31 +01:00
parent 9772ab9904 484356dd33
commit 1c55964be0
1 changed files with 1 additions and 0 deletions
--- a/src/plugins/cppeditor/CppEditor.mimetypes.xml
+++ b/src/plugins/cppeditor/CppEditor.mimetypes.xml
@@ -133,5 +133,6 @@
        <glob pattern="*.cxx"/>
        <glob pattern="*.c++"/>
        <glob pattern="*.C"/>
+        <glob pattern="*.inl"/>
    </mime-type>
 </mime-info>