| commit | 5806816b20f2e98f3ce00b6259a057afd4c45be3 | |
| author | Christian Thaeter <ct@pipapo.org> | |
| Tue, 21 Aug 2007 22:35:49 +0000 (22 00:35 +0200) | ||
| committer | Christian Thaeter <ct@pipapo.org> | |
| Tue, 21 Aug 2007 22:35:49 +0000 (22 00:35 +0200) | ||
| tree | 41a69ae5a2c396b6e48b221c44ef968165385772 | treesnapshot (tar.gz zip) |
| parent | 46448efccfb3b8a2cf966b0946e14a8418c0f9ff | commitdiff |
| parent | c5e20bbd23faef92a2923f48b1ce5ef2acf9fa89 | commitdiff |
Merge branch 'plugin-reroute' of git://git.pipapo.org/cinelerra/ichthyo into ct
Conflicts:
configure.ac
plugins/Makefile.am
Conflicts:
configure.ac
plugins/Makefile.am
| plugins/Makefile.am | diff1 | diff2 | blobhistory |
| plugins/reroute/Makefile.am | diff2 | blobhistory |