summaryrefslogtreecommitdiffstats
path: root/src/widgets/toolbox.h
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/widgets/toolbox.h
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/widgets/toolbox.h')
-rw-r--r--src/widgets/toolbox.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/widgets/toolbox.h b/src/widgets/toolbox.h
index d520d393d..0ae4d4630 100644
--- a/src/widgets/toolbox.h
+++ b/src/widgets/toolbox.h
@@ -118,7 +118,6 @@ void delete_connection(GObject * /*obj*/, sigc::connection *connection);
gchar const *label, gchar const *shortLabel, gchar const *tooltip,
Glib::ustring const &path, gdouble def,
GtkWidget *focusTarget,
- GtkWidget *us,
GObject *dataKludge,
gboolean altx, gchar const *altx_mark,
gdouble lower, gdouble upper, gdouble step, gdouble page,