diff options
| author | kamalpreetgrewal <grewalkamal005@gmail.com> | 2016-08-04 06:19:46 +0000 |
|---|---|---|
| committer | kamalpreetgrewal <grewalkamal005@gmail.com> | 2016-08-04 06:19:46 +0000 |
| commit | e0728cfe3dcf882045af5295ffd7c2725b6a430f (patch) | |
| tree | 3289217df16f6f73a2950cd3d40d24a9c856cae1 /src/widgets/text-toolbar.cpp | |
| parent | Add functionality to add and delete CSS property in CSS panel (diff) | |
| parent | Add legacy verb SP_VERB_SELECTION_OUTLINE_LEGACY as pointed in bug 1556592#14 (diff) | |
| download | inkscape-e0728cfe3dcf882045af5295ffd7c2725b6a430f.tar.gz inkscape-e0728cfe3dcf882045af5295ffd7c2725b6a430f.zip | |
Merge changes from trunk
(bzr r14949.1.62)
Diffstat (limited to 'src/widgets/text-toolbar.cpp')
| -rw-r--r-- | src/widgets/text-toolbar.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp index 23acb74af..3fa240a05 100644 --- a/src/widgets/text-toolbar.cpp +++ b/src/widgets/text-toolbar.cpp @@ -25,7 +25,7 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include <config.h> #endif #include "libnrtype/font-lister.h" @@ -41,9 +41,7 @@ #include "widgets/ink-action.h" #include "widgets/ink-comboboxentry-action.h" #include "inkscape.h" -#include "preferences.h" #include "selection-chemistry.h" -#include "selection.h" #include "sp-flowtext.h" #include "sp-root.h" #include "sp-text.h" @@ -53,11 +51,8 @@ #include "toolbox.h" #include "ui/icon-names.h" #include "ui/tools/text-tool.h" -#include "ui/tools/tool-base.h" #include "ui/widget/unit-tracker.h" -#include "util/units.h" #include "verbs.h" -#include "xml/repr.h" using Inkscape::DocumentUndo; using Inkscape::UI::ToolboxFactory; |