summaryrefslogtreecommitdiffstats
path: root/src/widgets/toolbox.cpp
diff options
context:
space:
mode:
authorMarkus Engel <markus.engel@tum.de>2013-07-25 19:06:28 +0000
committerMarkus Engel <markus.engel@tum.de>2013-07-25 19:06:28 +0000
commit73e263588ca2ca99ea7cac8bbf274695dcd0bec6 (patch)
tree75a0b4cbc426c1c21671ee784c0230b09ffd4fc4 /src/widgets/toolbox.cpp
parentMerged from trunk (r12419). (diff)
parentRemove unnecessary variable from the GMarkup-based unit parser (diff)
downloadinkscape-73e263588ca2ca99ea7cac8bbf274695dcd0bec6.tar.gz
inkscape-73e263588ca2ca99ea7cac8bbf274695dcd0bec6.zip
Merge from trunk (r12439).
(bzr r11608.1.108)
Diffstat (limited to 'src/widgets/toolbox.cpp')
-rw-r--r--src/widgets/toolbox.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 0b47b1e15..a3cd151ff 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -79,7 +79,7 @@
#include "calligraphy-toolbar.h"
#include "connector-toolbar.h"
#include "dropper-toolbar.h"
-#include "erasor-toolbar.h"
+#include "eraser-toolbar.h"
#include "gradient-toolbar.h"
#include "lpe-toolbar.h"
#include "mesh-toolbar.h"