summaryrefslogtreecommitdiffstats
path: root/src/knotholder.cpp
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2016-08-12 04:11:03 +0000
committerTed Gould <ted@gould.cx>2016-08-12 04:11:03 +0000
commitff848ebc9919d158c3ec3d7420e72b6aca99a3ea (patch)
tree030ab171865d0ed7f6bae3ef68315639cdb2622b /src/knotholder.cpp
parentMerging 0.92.x branch (diff)
parentCloneTiler: Further C++ification (diff)
downloadinkscape-ff848ebc9919d158c3ec3d7420e72b6aca99a3ea.tar.gz
inkscape-ff848ebc9919d158c3ec3d7420e72b6aca99a3ea.zip
Merge trunk
(bzr r14950.1.20)
Diffstat (limited to 'src/knotholder.cpp')
-rw-r--r--src/knotholder.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/knotholder.cpp b/src/knotholder.cpp
index a2d1cf017..98348a59f 100644
--- a/src/knotholder.cpp
+++ b/src/knotholder.cpp
@@ -22,7 +22,6 @@
#include "knotholder.h"
#include "knot-holder-entity.h"
#include "ui/tools/rect-tool.h"
-#include "sp-rect.h"
#include "ui/tools/arc-tool.h"
#include "sp-ellipse.h"
#include "ui/tools/tweak-tool.h"
@@ -37,12 +36,9 @@
#include "live_effects/effect.h"
#include "desktop.h"
#include "display/sp-canvas.h"
-#include "display/sp-canvas-item.h"
#include "verbs.h"
#include "ui/control-manager.h"
-#include "xml/repr.h" // for debugging only
-
using Inkscape::ControlManager;
using Inkscape::DocumentUndo;