summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2013-11-10 11:17:23 +0000
committerJabiertxof <jtx@jtx.marker.es>2013-11-10 11:17:23 +0000
commit3ed9b4ff7ebbae3ba6446d911001688bcbbdc847 (patch)
tree1be561f80d094c32e3d658a125e0fc5441f89429 /src
parentUpdate to trunk (diff)
downloadinkscape-3ed9b4ff7ebbae3ba6446d911001688bcbbdc847.tar.gz
inkscape-3ed9b4ff7ebbae3ba6446d911001688bcbbdc847.zip
Update to trunk
(bzr r11950.1.196)
Diffstat (limited to 'src')
-rw-r--r--src/live_effects/lpe-bspline.cpp2
-rw-r--r--src/ui/tools/node-tool.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/live_effects/lpe-bspline.cpp b/src/live_effects/lpe-bspline.cpp
index ef03d8ef0..c19eda8f0 100644
--- a/src/live_effects/lpe-bspline.cpp
+++ b/src/live_effects/lpe-bspline.cpp
@@ -17,7 +17,7 @@
#include "live_effects/parameter/parameter.h"
#include "ui/widget/scalar.h"
#include "ui/tool/node.h"
-#include "ui/tool/node-tool.h"
+#include "ui/tools/node-tool.h"
#include "ui/tool/control-point-selection.h"
#include "ui/tool/selectable-control-point.h"
#include "selection.h"
diff --git a/src/ui/tools/node-tool.h b/src/ui/tools/node-tool.h
index 4d15ab70e..b3acb79ad 100644
--- a/src/ui/tools/node-tool.h
+++ b/src/ui/tools/node-tool.h
@@ -14,6 +14,7 @@
#include <boost/ptr_container/ptr_map.hpp>
#include <glib.h>
#include "ui/tools/tool-base.h"
+#include "selection.h"
namespace Inkscape {
namespace Display {