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/ui/dialog/dock-behavior.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/ui/dialog/dock-behavior.cpp')
| -rw-r--r-- | src/ui/dialog/dock-behavior.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/ui/dialog/dock-behavior.cpp b/src/ui/dialog/dock-behavior.cpp index 50a6db208..ec630c08f 100644 --- a/src/ui/dialog/dock-behavior.cpp +++ b/src/ui/dialog/dock-behavior.cpp @@ -12,7 +12,7 @@ #ifdef HAVE_CONFIG_H -# include <config.h> +#include "config.h" #endif #include "dock-behavior.h" @@ -23,15 +23,11 @@ #include "ui/widget/dock.h" #include "verbs.h" #include "dialog.h" -#include "preferences.h" #include "ui/dialog-events.h" #include <gtkmm/invisible.h> -#include <gtkmm/label.h> #include <gtkmm/stock.h> -#include <gtk/gtk.h> - namespace Inkscape { namespace UI { namespace Dialog { |