Merge branch 'subtitles' of git+ssh://saintdev@repo.or.cz/srv/git/libmkv
authorNathan Caldwell <saintdev@gmail.com>
Mon, 18 May 2009 23:28:05 +0000 (17:28 -0600)
committerNathan Caldwell <saintdev@gmail.com>
Mon, 18 May 2009 23:28:05 +0000 (17:28 -0600)
commit6171ae7fb6dc29ef4674bf31a5068629a84cc0d2
treee9816e21e02e5a137f1d8254a4d4fe484f3605e5
parentfba32b267ef64deb15ea3d49d396e03085804aa8
parent26c01e7ec65999629c372efc8ab3af9fd03fb09f
Merge branch 'subtitles' of git+ssh://saintdev@repo.or.cz/srv/git/libmkv
include/libmkv.h
src/matroska.c
src/matroska.h