Skip to content

V
vlc-1.1
Commit 9dd4633a authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Fix conflict resolution error

parent 865010ec
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
modules/video_filter/Modules.am
View file @ 9dd4633a
...@@ -17,6 +17,7 @@ SOURCES_scale = scale.c ...@@ -17,6 +17,7 @@ SOURCES_scale = scale.c
SOURCES_marq = marq.c SOURCES_marq = marq.c
SOURCES_rss = rss.c SOURCES_rss = rss.c
SOURCES_motiondetect = motiondetect.c SOURCES_motiondetect = motiondetect.c
SOURCES_rv32 = rv32.c
libosdmenu_plugin_la_SOURCES = osdmenu.c libosdmenu_plugin_la_SOURCES = osdmenu.c
libosdmenu_plugin_la_CFLAGS = $(AM_CFLAGS) -DPKGDATADIR=\"$(vlcdatadir)\" libosdmenu_plugin_la_CFLAGS = $(AM_CFLAGS) -DPKGDATADIR=\"$(vlcdatadir)\"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment