summaryrefslogtreecommitdiffstats
path: root/src/box3d-side.h
diff options
context:
space:
mode:
authorJabier Arraiza <jabier.arraiza@marker.es>2017-11-03 00:10:02 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2017-11-03 00:10:02 +0000
commitd2df0412f728dd5bb54537dfdfe7c35b34d40e0e (patch)
treee2703384779e83312c456399999997fcc289c5cf /src/box3d-side.h
parentMerge branch 'master' into powerpencil (diff)
parentchange assignment to equality (diff)
downloadinkscape-d2df0412f728dd5bb54537dfdfe7c35b34d40e0e.tar.gz
inkscape-d2df0412f728dd5bb54537dfdfe7c35b34d40e0e.zip
Merge branch 'master' into powerpencil
Diffstat (limited to 'src/box3d-side.h')
-rw-r--r--src/box3d-side.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/box3d-side.h b/src/box3d-side.h
index 4783a5f24..29f17b8f3 100644
--- a/src/box3d-side.h
+++ b/src/box3d-side.h
@@ -43,7 +43,7 @@ public:
void box3d_side_position_set (Box3DSide *side); // FIXME: Replace this by box3d_side_set_shape??
-char *box3d_side_axes_string(Box3DSide *side);
+Glib::ustring box3d_side_axes_string(Box3DSide *side);
Persp3D *box3d_side_perspective(Box3DSide *side);