summaryrefslogtreecommitdiff
path: root/ext/tk/sample/tkextlib/vu/canvSticker2.rb
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-21 15:59:24 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-21 15:59:24 +0000
commit3edf43c4cfe9df91ba30888fb631eec036595f88 (patch)
treefd9715eac15f26bd9b10dc7ed3949ffd48d3817c /ext/tk/sample/tkextlib/vu/canvSticker2.rb
parent389278af977066c5c8b077432920db6df89fcd6a (diff)
ChangeLog: conflict mark removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14435 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk/sample/tkextlib/vu/canvSticker2.rb')
0 files changed, 0 insertions, 0 deletions