summaryrefslogtreecommitdiffstats
path: root/src/snap-preferences.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/snap-preferences.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/snap-preferences.cpp')
-rw-r--r--src/snap-preferences.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/snap-preferences.cpp b/src/snap-preferences.cpp
index 79e47ca83..9985b0185 100644
--- a/src/snap-preferences.cpp
+++ b/src/snap-preferences.cpp
@@ -10,8 +10,6 @@
*/
#include "inkscape.h"
-#include "snap-preferences.h"
-#include <glib.h> // g_assert()
Inkscape::SnapPreferences::SnapPreferences() :
_snap_enabled_globally(true),