]> git.sesse.net Git - kdenlive/commit
resolved created conflict (i hope)
authorMarco Gittler <marco@gitma.de>
Sun, 2 Mar 2008 17:23:17 +0000 (17:23 +0000)
committerMarco Gittler <marco@gitma.de>
Sun, 2 Mar 2008 17:23:17 +0000 (17:23 +0000)
commitc0ce3afe03b8af267e52f9a32708ed2f8cdf012c
tree12077588be13dadd6fa65d561e214a74016744d5
parent626fe262b6f9589883be7ea1b910aacec3defc6e
resolved created conflict (i hope)

svn path=/branches/KDE4/; revision=1977
src/clipitem.cpp