diff options
| author | Shlomi Fish <shlomif@shlomifish.org> | 2016-09-23 12:51:11 +0000 |
|---|---|---|
| committer | Shlomi Fish <shlomif@shlomifish.org> | 2016-09-23 12:51:11 +0000 |
| commit | 23fe0d70dbef6ac9b12090c36c50abdc5387c547 (patch) | |
| tree | 6c67e18c9e92508ceb0babbd1d4d27991db7d9e6 /src/style.cpp | |
| parent | Remove "== true"s (diff) | |
| parent | Remove properties with default values from 'style' entries in users preferenc... (diff) | |
| download | inkscape-23fe0d70dbef6ac9b12090c36c50abdc5387c547.tar.gz inkscape-23fe0d70dbef6ac9b12090c36c50abdc5387c547.zip | |
Merged.
(bzr r15100.1.20)
Diffstat (limited to 'src/style.cpp')
| -rw-r--r-- | src/style.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/style.cpp b/src/style.cpp index e51733cf0..930e271ad 100644 --- a/src/style.cpp +++ b/src/style.cpp @@ -110,7 +110,7 @@ SPStyle::SPStyle(SPDocument *document_in, SPObject *object_in) : font_variant_caps( "font-variant-caps", enum_font_variant_caps, SP_CSS_FONT_VARIANT_CAPS_NORMAL ), font_variant_numeric( "font-variant-numeric", enum_font_variant_numeric ), font_variant_alternates("font-variant-alternates", enum_font_variant_alternates, SP_CSS_FONT_VARIANT_ALTERNATES_NORMAL ), - font_variant_east_asian("font-variant-east_asian", enum_font_variant_east_asian, SP_CSS_FONT_VARIANT_EAST_ASIAN_NORMAL ), + font_variant_east_asian("font-variant-east-asian", enum_font_variant_east_asian, SP_CSS_FONT_VARIANT_EAST_ASIAN_NORMAL ), font_feature_settings( "font-feature-settings", "normal" ), // Text related properties |