[vlc-commits] Fix conflict resolution error

[Rémi Denis-Courmont]

vlc/vlc-1.1 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Jul 23 11:17:38 2011 +0300| [9dd4633a4c8fa30db4ad57cd180a5324406df16d] | committer: Rémi Denis-Courmont

Fix conflict resolution error

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=9dd4633a4c8fa30db4ad57cd180a5324406df16d
---

 modules/video_filter/Modules.am |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/modules/video_filter/Modules.am b/modules/video_filter/Modules.am
index 5536e34..afa6330 100644
--- a/modules/video_filter/Modules.am
+++ b/modules/video_filter/Modules.am
@@ -17,6 +17,7 @@ SOURCES_scale = scale.c
 SOURCES_marq = marq.c
 SOURCES_rss = rss.c
 SOURCES_motiondetect = motiondetect.c
+SOURCES_rv32 = rv32.c
 
 libosdmenu_plugin_la_SOURCES = osdmenu.c
 libosdmenu_plugin_la_CFLAGS = $(AM_CFLAGS) -DPKGDATADIR=\"$(vlcdatadir)\"