• Rémi Denis-Courmont's avatar
    Merge branch 1.0-bugfix · 7f124704
    Rémi Denis-Courmont authored
    Conflicts:
    	modules/video_filter/extract.c
    	modules/video_filter/marq.c
    	projects/mozilla/control/npolibvlc.cpp
    	src/control/video.c
    7f124704
Name
Last commit
Last update
..
video_output.c Loading commit data...
video_text.c Loading commit data...
video_widgets.c Loading commit data...
vout_control.h Loading commit data...
vout_internal.h Loading commit data...
vout_intf.c Loading commit data...
vout_pictures.c Loading commit data...
vout_pictures.h Loading commit data...
vout_subpictures.c Loading commit data...