diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-11-07 23:11:54 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-11-07 23:11:54 +0000 |
| commit | 51639504fbee801b07900b8ffeef069157d298cb (patch) | |
| tree | 6aec1edd9cfaf33d18e8f2cb61e90bcfaf99b9e1 /src/widgets/text-toolbar.cpp | |
| parent | Fixes to CPU (diff) | |
| parent | Merge branch 'luzpaz/inkscape-typos' (!119) (diff) | |
| download | inkscape-51639504fbee801b07900b8ffeef069157d298cb.tar.gz inkscape-51639504fbee801b07900b8ffeef069157d298cb.zip | |
Merge branch 'master' into fixSymbolsCpuProblems
Diffstat (limited to 'src/widgets/text-toolbar.cpp')
| -rw-r--r-- | src/widgets/text-toolbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp index 9e138bb08..3ca5bf2dc 100644 --- a/src/widgets/text-toolbar.cpp +++ b/src/widgets/text-toolbar.cpp @@ -1654,7 +1654,7 @@ static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/ // If unit is set to 'px', use the preferred display unit (if absolute). line_height_unit = prefs->getInt("/tools/text/lineheight/display_unit", SP_CSS_UNIT_PT); - // But not if prefered unit is relative + // But not if preferred unit is relative if (line_height_unit != SP_CSS_UNIT_NONE && line_height_unit != SP_CSS_UNIT_EM && line_height_unit != SP_CSS_UNIT_EX && |