summaryrefslogtreecommitdiffstats
path: root/src/id-clash.cpp
diff options
context:
space:
mode:
authorAndrew Higginson <at.higginson@gmail.com>2011-12-27 21:04:47 +0000
committerAndrew <at.higginson@gmail.com>2011-12-27 21:04:47 +0000
commit80960b623a99aae1402ab651b2974ef544ed3b03 (patch)
treeba49d42c2789e9e11f805e2d5263e10f9fedeef8 /src/id-clash.cpp
parenttry to fix bug (diff)
parentGDL: Cherry-pick upstream patch 73852 (2011-03-23) - Add missing return value. (diff)
downloadinkscape-80960b623a99aae1402ab651b2974ef544ed3b03.tar.gz
inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.zip
merged with trunk so I can build again...
(bzr r10092.1.36)
Diffstat (limited to 'src/id-clash.cpp')
-rw-r--r--src/id-clash.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/id-clash.cpp b/src/id-clash.cpp
index 67e27e2f0..e5a40868b 100644
--- a/src/id-clash.cpp
+++ b/src/id-clash.cpp
@@ -1,4 +1,4 @@
-/** \file
+/*
* Routines for resolving ID clashes when importing or pasting.
*
* Authors:
@@ -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;