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 (18 17:28 -0600)
committerNathan Caldwell <saintdev@gmail.com>
Mon, 18 May 2009 23:28:05 +0000 (18 17:28 -0600)
1  2 
include/libmkv.h
src/matroska.c
src/matroska.h

Simple merge
diff --cc src/matroska.c
Simple merge
diff --cc src/matroska.h
Simple merge