| commit | 9bd0067b48fb174cde4c80c59aa064e2dcec3f62 | |
| author | Christian Thaeter <ct@pipapo.org> | |
| Wed, 22 Aug 2007 05:45:49 +0000 (22 07:45 +0200) | ||
| committer | Christian Thaeter <ct@pipapo.org> | |
| Wed, 22 Aug 2007 05:45:49 +0000 (22 07:45 +0200) | ||
| tree | fddc5c079ee9fe2b3fced6fd5130bdcbbe26781e | treesnapshot (tar.gz zip) |
| parent | cb9916781fc4f0669cbe04ce5e936b296e7596a4 | commitdiff |
| parent | 924b4ca61fa9baf1b952bc0b4c25c72e547804ed | commitdiff |
Merge branch 'master' of git://git.pipapo.org/cinelerra/svn into ct
Conflicts:
configure.ac
plugins/Makefile.am
plugins/reroute/Makefile.am
Conflicts:
configure.ac
plugins/Makefile.am
plugins/reroute/Makefile.am