summaryrefslogtreecommitdiffstats
path: root/src/widgets/toolbox.cpp
diff options
context:
space:
mode:
authorMatthew Petroff <matthew@mpetroff.net>2013-07-30 01:54:37 +0000
committerMatthew Petroff <matthew@mpetroff.net>2013-07-30 01:54:37 +0000
commit3dab417176ed1ba5b1301acbd9a1c08e8c546c49 (patch)
tree83d01a0cc1356dd914b6690a5dbffd6e840e16af /src/widgets/toolbox.cpp
parentUpdate unit extraction regular expressions. (diff)
parentRemove unnecessary variable from the GMarkup-based unit parser (diff)
downloadinkscape-3dab417176ed1ba5b1301acbd9a1c08e8c546c49.tar.gz
inkscape-3dab417176ed1ba5b1301acbd9a1c08e8c546c49.zip
Merge from trunk.
(bzr r12380.1.51)
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 dcd4360fd..f3a83e84a 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -76,7 +76,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"