mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 17:20:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

configure: Fix merge mistake

Browse source
This commit is contained in:
Sebastian Dröge 2010-03-12 08:23:46 +00:00
parent 7efecfc961
commit 81e6d94bb5
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configure.ac
View file

@ -1641,11 +1641,8 @@ gst/frei0r/Makefile
gst/h264parse/Makefile
gst/hdvparse/Makefile
gst/id3tag/Makefile
<<<<<<< HEAD
gst/invtelecine/Makefile
=======
gst/imagefreeze/Makefile
>>>>>>> imagefreeze: Add still frame stream generator element
gst/jpegformat/Makefile
gst/legacyresample/Makefile
gst/librfb/Makefile