summaryrefslogtreecommitdiffstats
path: root/src/id-clash.cpp
diff options
context:
space:
mode:
authorKrzysztof Kosi??ski <tweenk.pl@gmail.com>2011-06-19 10:00:24 +0000
committerKrzysztof KosiƄski <tweenk.pl@gmail.com>2011-06-19 10:00:24 +0000
commit06dfaa02d7a80bcdff717d579a48f81643f53f31 (patch)
tree49b8e67ad9051f1507b0959cac986383ab4001e2 /src/id-clash.cpp
parentFix rendering of control points (diff)
parentfix bug 796451: Measure tools should support rotation constraint (diff)
downloadinkscape-06dfaa02d7a80bcdff717d579a48f81643f53f31.tar.gz
inkscape-06dfaa02d7a80bcdff717d579a48f81643f53f31.zip
Merge from trunk
(bzr r9508.1.89)
Diffstat (limited to 'src/id-clash.cpp')
-rw-r--r--src/id-clash.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/id-clash.cpp b/src/id-clash.cpp
index 67e27e2f0..d5740c0ba 100644
--- a/src/id-clash.cpp
+++ b/src/id-clash.cpp
@@ -22,8 +22,10 @@
#include "id-clash.h"
#include "sp-object.h"
#include "style.h"
+#include "sp-paint-server.h"
#include "xml/node.h"
#include "xml/repr.h"
+#include "sp-root.h"
typedef enum { REF_HREF, REF_STYLE, REF_URL, REF_CLIPBOARD } ID_REF_TYPE;