• 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
..
art.c Loading commit data...
art.h Loading commit data...
control.c Loading commit data...
engine.c Loading commit data...
fetcher.c Loading commit data...
fetcher.h Loading commit data...
item.c Loading commit data...
loadsave.c Loading commit data...
playlist_internal.h Loading commit data...
preparser.c Loading commit data...
preparser.h Loading commit data...
search.c Loading commit data...
services_discovery.c Loading commit data...
sort.c Loading commit data...
thread.c Loading commit data...
tree.c Loading commit data...