I hate conflicts, this was supposed to go in yesterday

Original commit message from CVS:
I hate conflicts, this was supposed to go in yesterday
parent 485042fe
......@@ -1709,6 +1709,7 @@ testsuite/Makefile
tools/Makefile
tools/gst-launch-ext
gconf/Makefile
gconf/gstreamer.schemas
pkgconfig/Makefile
po/Makefile.in
)
......
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