| commit | 9541418cdd6d88849a189a2fc9e64798ee86495f | |
| author | Nathan Caldwell <saintdev@gmail.com> | |
| Mon, 12 Jan 2009 05:02:39 +0000 (11 22:02 -0700) | ||
| committer | Nathan Caldwell <saintdev@gmail.com> | |
| Mon, 12 Jan 2009 05:02:39 +0000 (11 22:02 -0700) | ||
| tree | e3198afe8b8fc86fbba7a3429be4ab619b436693 | treesnapshot (tar.gz zip) |
| parent | 9f42e961d36bc97724c7042a6ede5c7b5ddf0fb1 | commitdiff |
| parent | afede70d648c53d14495e456225ee59c8bb29855 | commitdiff |
Merge branch 'master' into subtitles
Conflicts:
include/libmkv.h
src/matroska.c
src/matroska.h
src/tracks.c
Conflicts:
include/libmkv.h
src/matroska.c
src/matroska.h
src/tracks.c
| include/libmkv.h | diff1 | diff2 | blobhistory |
| src/matroska.c | diff1 | diff2 | blobhistory |
| src/matroska.h | diff1 | diff2 | blobhistory |
| src/tracks.c | diff1 | diff2 | blobhistory |