diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-11-10 02:08:46 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2013-11-10 02:08:46 +0000 |
| commit | ca1286aa677b5ff8d80fe274dfa3e759478570b3 (patch) | |
| tree | 36c7edfa575cea3d3bddfc4b034f7a35a8374ade /src/live_effects | |
| parent | Fixing bugs on update to trunk (diff) | |
| parent | Revert unintentional change. (diff) | |
| download | inkscape-ca1286aa677b5ff8d80fe274dfa3e759478570b3.tar.gz inkscape-ca1286aa677b5ff8d80fe274dfa3e759478570b3.zip | |
Update to trunk
(bzr r11950.1.195)
Diffstat (limited to 'src/live_effects')
| -rw-r--r-- | src/live_effects/effect.cpp | 2 | ||||
| -rw-r--r-- | src/live_effects/lpe-line_segment.cpp | 2 | ||||
| -rw-r--r-- | src/live_effects/parameter/path.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index e47b4c3e9..3289c239e 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -61,7 +61,7 @@ #include "document-private.h" #include "xml/document.h" #include <glibmm/i18n.h> -#include "pen-context.h" +#include "ui/tools/pen-tool.h" #include "tools-switch.h" #include "message-stack.h" #include "desktop.h" diff --git a/src/live_effects/lpe-line_segment.cpp b/src/live_effects/lpe-line_segment.cpp index 793b00bcc..78d286143 100644 --- a/src/live_effects/lpe-line_segment.cpp +++ b/src/live_effects/lpe-line_segment.cpp @@ -12,7 +12,7 @@ */ #include "live_effects/lpe-line_segment.h" -#include "lpe-tool-context.h" +#include "ui/tools/lpe-tool.h" #include <2geom/pathvector.h> #include <2geom/geom.h> diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp index 6e951f6ea..77f7eabcc 100644 --- a/src/live_effects/parameter/path.cpp +++ b/src/live_effects/parameter/path.cpp @@ -40,7 +40,7 @@ #include "sp-text.h" #include "display/curve.h" -#include "ui/tool/node-tool.h" +#include "ui/tools/node-tool.h" #include "ui/tool/multi-path-manipulator.h" #include "ui/tool/shape-record.h" |