summaryrefslogtreecommitdiffstats
path: root/src/conn-avoid-ref.cpp
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc@jeanmougin.fr>2015-12-08 08:29:33 +0000
committerMarc Jeanmougin <marcjeanmougin@free.fr>2015-12-08 08:29:33 +0000
commit5e5f10dfcca24194acdcb4b301f9e989ddc6e209 (patch)
tree9287d4cdc6ff3281620a65091fb9a3ccd13c9b79 /src/conn-avoid-ref.cpp
parentfix crash (oops) (diff)
parentmerge lp:~inkscape.dev/inkscape/lock_guides (diff)
downloadinkscape-5e5f10dfcca24194acdcb4b301f9e989ddc6e209.tar.gz
inkscape-5e5f10dfcca24194acdcb4b301f9e989ddc6e209.zip
update to trunk + resolve conflicts
(bzr r14504.1.9)
Diffstat (limited to 'src/conn-avoid-ref.cpp')
0 files changed, 0 insertions, 0 deletions