summaryrefslogtreecommitdiffstats
path: root/src/flood-context.cpp
diff options
context:
space:
mode:
authorMarkus Engel <markus.engel@tum.de>2013-08-30 21:35:42 +0000
committerMarkus Engel <markus.engel@tum.de>2013-08-30 21:35:42 +0000
commit8756c49b91fd4262b6770ac3b2f229209bdae96b (patch)
tree67ac89d7bc7c69e04e811324734dccafc07f33c9 /src/flood-context.cpp
parentMerged from trunk (r12465). (diff)
parentMerge emf/wmf work (diff)
downloadinkscape-8756c49b91fd4262b6770ac3b2f229209bdae96b.tar.gz
inkscape-8756c49b91fd4262b6770ac3b2f229209bdae96b.zip
Merged from trunk (r12488).
(bzr r11608.1.120)
Diffstat (limited to 'src/flood-context.cpp')
-rw-r--r--src/flood-context.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/flood-context.cpp b/src/flood-context.cpp
index 09a1d5742..1f2a240ca 100644
--- a/src/flood-context.cpp
+++ b/src/flood-context.cpp
@@ -54,7 +54,6 @@
#include "sp-defs.h"
#include "sp-item.h"
#include "splivarot.h"
-#include "sp-metrics.h"
#include "sp-namedview.h"
#include "sp-object.h"
#include "sp-path.h"