summaryrefslogtreecommitdiffstats
path: root/src/desktop.cpp
diff options
context:
space:
mode:
authorLiam P. White <inkscapebrony@gmail.com>2014-10-29 22:40:05 +0000
committerLiam P. White <inkscapebrony@gmail.com>2014-10-29 22:40:05 +0000
commite9943b70c7bf507b9639ecb0a421bcee7ce93e33 (patch)
tree2d2fe7ee7a566e1ef1a5dcde18296d9f21188f35 /src/desktop.cpp
parenti18n. Fixing untranslated strings. (diff)
parentMerge with trunk r13640 (diff)
downloadinkscape-e9943b70c7bf507b9639ecb0a421bcee7ce93e33.tar.gz
inkscape-e9943b70c7bf507b9639ecb0a421bcee7ce93e33.zip
Merge experimental
(bzr r13641)
Diffstat (limited to 'src/desktop.cpp')
-rw-r--r--src/desktop.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/desktop.cpp b/src/desktop.cpp
index f14a314b9..74dea3ca1 100644
--- a/src/desktop.cpp
+++ b/src/desktop.cpp
@@ -55,7 +55,7 @@
#include "document-undo.h"
#include "event-log.h"
#include "helper/action-context.h"
-#include "interface.h"
+#include "ui/interface.h"
#include "inkscape-private.h"
#include "layer-fns.h"
#include "layer-manager.h"
@@ -72,7 +72,7 @@
#include "sp-namedview.h"
#include "sp-root.h"
#include "sp-defs.h"
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
#include "widgets/desktop-widget.h"
#include "xml/repr.h"
#include "helper/action.h" //sp_action_perform