wm4 51e198c2a1 Merge remote-tracking branch 'origin/master' ... Conflicts: .gitignore bstr.c cfg-mplayer.h defaultopts.c libvo/video_out.c The conflict in bstr.c is due to uau adding a bstr_getline function in commit 2ba8b91a97. This function already existed in this branch. While uau's function is obviously derived from mine, it's incompatible. His function preserves line breaks, while mine strips them. Add a bstr_strip_linebreaks function, fix all other uses of bstr_getline, and pick uau's implementation. In .gitignore, change vo_gl3_shaders.h to use an absolute path additional to resolving the merge conflict.		2012-07-28 17:24:05 +02:00
..
tl_cue.c	Merge remote-tracking branch 'origin/master'	2012-07-28 17:24:05 +02:00
tl_edl.c	demuxer.h: avoid including stream.h	2011-08-19 21:37:16 +03:00
tl_matroska.c	Merge remote-tracking branch 'origin/master' into my_master	2012-03-16 19:14:44 +01:00