summaryrefslogtreecommitdiffstats
path: root/src/ui/dialog/floating-behavior.cpp
diff options
context:
space:
mode:
authorkamalpreetgrewal <grewalkamal005@gmail.com>2016-08-04 06:19:46 +0000
committerkamalpreetgrewal <grewalkamal005@gmail.com>2016-08-04 06:19:46 +0000
commite0728cfe3dcf882045af5295ffd7c2725b6a430f (patch)
tree3289217df16f6f73a2950cd3d40d24a9c856cae1 /src/ui/dialog/floating-behavior.cpp
parentAdd functionality to add and delete CSS property in CSS panel (diff)
parentAdd legacy verb SP_VERB_SELECTION_OUTLINE_LEGACY as pointed in bug 1556592#14 (diff)
downloadinkscape-e0728cfe3dcf882045af5295ffd7c2725b6a430f.tar.gz
inkscape-e0728cfe3dcf882045af5295ffd7c2725b6a430f.zip
Merge changes from trunk
(bzr r14949.1.62)
Diffstat (limited to 'src/ui/dialog/floating-behavior.cpp')
-rw-r--r--src/ui/dialog/floating-behavior.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/ui/dialog/floating-behavior.cpp b/src/ui/dialog/floating-behavior.cpp
index 55ef0c5bb..5ac3a25ad 100644
--- a/src/ui/dialog/floating-behavior.cpp
+++ b/src/ui/dialog/floating-behavior.cpp
@@ -11,13 +11,12 @@
*/
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
#endif
#include <gtkmm/dialog.h>
#include <gtkmm/stock.h>
#include <glibmm/main.h>
-#include <gtk/gtk.h>
#include "floating-behavior.h"
#include "dialog.h"
@@ -26,7 +25,6 @@
#include "desktop.h"
#include "ui/dialog-events.h"
#include "ui/interface.h"
-#include "preferences.h"
#include "verbs.h"
namespace Inkscape {