tokkee.org

Code

projects / inkscape.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6428b8d d5d2f93)

author	Ted Gould <ted@gould.cx>
	Fri, 26 Mar 2010 04:34:25 +0000 (23:34 -0500)
committer	Ted Gould <ted@gould.cx>
	Fri, 26 Mar 2010 04:34:25 +0000 (23:34 -0500)
commit	76ed722031d5028acba4392554558ad9df9e26ce
tree	33f1392a340737e4eeefca6fd031f96c29befd2b	tree \| snapshot
parent	6428b8d4201a5717bd155bf02e6dafeedf3e8aa9	commit \| diff
parent	d5d2f9394e3e53d83ec424dfa28b65511c6ba7ac	commit \| diff

Merge from trunk

Makefile.am	diff1 \|	diff2 \|	blob \| history
autogen.sh	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/display/sp-canvas.cpp	diff1 \|	diff2 \|	blob \| history
src/display/sp-canvas.h	diff1 \|	diff2 \|	blob \| history
src/extension/init.cpp	diff1 \|	diff2 \|	blob \| history
src/selection.h	diff1 \|	diff2 \|	blob \| history

OpenSource vector graphics editor (BZR clone)