Skip to content
Find file Blame History Permalink
  • 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
To find the state of this project's repository at the time of any of these versions, check out the tags.

VideoLAN code repository instance