| commit | e35fa5dcc1513afd493c298110f3e63c4981c593 | |
| author | Nathan Caldwell <saintdev@gmail.com> | |
| Thu, 16 Aug 2007 18:54:09 +0000 (16 12:54 -0600) | ||
| committer | Nathan Caldwell <saintdev@gmail.com> | |
| Thu, 16 Aug 2007 18:54:09 +0000 (16 12:54 -0600) | ||
| tree | 771559fe2f6bc3dccdc0bda3c39024ebc4089713 | treesnapshot (tar.gz zip) |
| parent | 81b31ad7c5905787baa74b124b87f82318d1fbef | commitdiff |
| parent | b2831e193fc23a719598f54006416e87e04032ea | commitdiff |
Merge branch 'vlc_compat'
Conflicts:
src/matroska.c
Conflicts:
src/matroska.c
| src/matroska.c | diff1 | diff2 | blobhistory |