diff options
| author | Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de> | 2015-02-04 15:46:20 +0100 |
|---|---|---|
| committer | Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de> | 2015-02-04 15:46:20 +0100 |
| commit | f406236863419349508c9f74c7a7bc8893e8fe3a (patch) | |
| tree | 22a73ea723f312653b1f3d49e505155fe45523fe /testdata/xmlparser/color.oxm | |
| parent | 9a5ca5397cc7903728e808c861f0a7fe1198bb43 (diff) | |
| parent | a8a911a73793d42f8d39d7a1babf4eb4a9965a5e (diff) | |
Merge branch 'master' of somweyr.de:ousia
Conflicts:
application/src/plugins/xml/XmlParser.cpp
Diffstat (limited to 'testdata/xmlparser/color.oxm')
| -rw-r--r-- | testdata/xmlparser/color.oxm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/testdata/xmlparser/color.oxm b/testdata/xmlparser/color.oxm index 8a12e7a..17adea4 100644 --- a/testdata/xmlparser/color.oxm +++ b/testdata/xmlparser/color.oxm @@ -1,5 +1,5 @@ <?xml version="1.0" standalone="yes"?> -<ousia> +<typesystem name="color"> <struct name="color"> <field name="r" type="int"/> <field name="g" type="int"/> @@ -15,4 +15,4 @@ <constant name="azure3" type="color" value="[193,205,205]"/> <constant name="azure4" type="color" value="[131,139,139]"/> <constant name="azure" type="color" value="[240,255,255]"/> -</ousia> +</typesystem> |