diff options
| author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-02-15 21:32:54 +0100 |
|---|---|---|
| committer | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-02-15 21:32:54 +0100 |
| commit | 8e5e08c4f293434585d2a88f7f331f8ce49b67b9 (patch) | |
| tree | fa82a937b1ea80f45d7955938c333f68f8a0f3f6 /contrib/gtksourceview-3.0 | |
| parent | 2544749215bc2465bfeca431e271110ca86d8a83 (diff) | |
| parent | 40f4666c43211d9071a827ad8a2524688e7f678f (diff) | |
Merge branch 'astoecke_parser_stack_new'
Conflicts:
application/src/core/parser/stack/DocumentHandler.cpp
application/src/core/parser/stack/DocumentHandler.hpp
Diffstat (limited to 'contrib/gtksourceview-3.0')
| -rw-r--r-- | contrib/gtksourceview-3.0/language-specs/ousia.lang | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/gtksourceview-3.0/language-specs/ousia.lang b/contrib/gtksourceview-3.0/language-specs/ousia.lang index 4cefac3..7a91d1e 100644 --- a/contrib/gtksourceview-3.0/language-specs/ousia.lang +++ b/contrib/gtksourceview-3.0/language-specs/ousia.lang @@ -24,7 +24,7 @@ <language id="ousia" _name="Ousia" version="2.0" _section="Markup"> <metadata> <property name="mimetypes">text/vnd.ousia</property> - <property name="globs">*.osdm</property> + <property name="globs">*.osml</property> <property name="line-comment-start">%</property> <property name="block-comment-start">%{</property> <property name="block-comment-end">}%</property> |