| commit | aacaa651a03e6c7d3f4c05db6d602f81411a14a5 | |
| author | Christian Thaeter <ct@pipapo.org> | |
| Fri, 5 Oct 2007 11:59:22 +0000 (5 13:59 +0200) | ||
| committer | Christian Thaeter <ct@pipapo.org> | |
| Fri, 5 Oct 2007 11:59:22 +0000 (5 13:59 +0200) | ||
| tree | 691af560f7e3419bd09980e3821344a2a70ad610 | treesnapshot (tar.gz zip) |
| parent | 9f65ae70cff370cd76baec8564345ce47f8b41fc | commitdiff |
| parent | 5e3e8862fa2fcd5c2f370d61275e6a4e0988bb8b | commitdiff |
Merge branch 'master' of git://git.pipapo.org/cinelerra/svn into ct
Conflicts:
AUTHORS
cinelerra/fileogg.C
Conflicts:
AUTHORS
cinelerra/fileogg.C
| AUTHORS | diff1 | diff2 | blobhistory |
| cinelerra/fileogg.C | diff1 | diff2 | blobhistory |