Merge branch 'ct' of git.pipapo.org:cinelerra-ct into ctct
commitc7ec24131de807d75a9fb0ba5905791e5fe574b5
authorChristian Thaeter <ct@pipapo.org>
Mon, 3 Dec 2007 20:37:23 +0000 (3 21:37 +0100)
committerChristian Thaeter <ct@pipapo.org>
Mon, 3 Dec 2007 20:37:23 +0000 (3 21:37 +0100)
tree5024abb18f724277616c017ebfe538c17934c5cf
parentcb291faa0efef95eb89acf363e80826f7506a84a
parentefdc2a8305a6d9820b210bca8b7ff05e5fce040d
Merge branch 'ct' of git.pipapo.org:cinelerra-ct into ct