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
This commit is contained in:
Thomas Vander Stichele 2004-02-24 17:05:53 +00:00
parent c084e686c8
commit bb44116e43

View file

@ -1709,6 +1709,7 @@ testsuite/Makefile
tools/Makefile tools/Makefile
tools/gst-launch-ext tools/gst-launch-ext
gconf/Makefile gconf/Makefile
gconf/gstreamer.schemas
pkgconfig/Makefile pkgconfig/Makefile
po/Makefile.in po/Makefile.in
) )