Christian Thaeter 69e7123a92 Merge commit 'ichthyo/master' ... Conflicts: uml/cinelerra3/cinelerra3.prj		2007-07-04 14:19:07 +02:00
..
cinelerra3	Merge commit 'ichthyo/master'	2007-07-04 14:19:07 +02:00
DIR_INFO	few more DIR_INFO's	2007-06-22 04:14:14 +02:00