Fixed some build errors.

Original commit message from CVS: Fixed some build errors.
2000-05-01 23:22:04 +00:00 · 2000-05-01 23:22:04 +00:00 · 8b8574407e
commit 8b8574407e
parent 58dede8409
2 changed files with 6 additions and 4 deletions
--- a/docs/gst/.gitignore
+++ b/docs/gst/.gitignore
@ -4,3 +4,7 @@ html
 sgml
 gstreamer.signals
 gstreamer.html
+gstreamer-unused.txt
+gstreamer-decl-list.txt
+gstreamer.args
+
--- a/test/.gitignore
+++ b/test/.gitignore
@ -33,10 +33,8 @@ ac3play
 dvdcat
 fake
 cobin
-<<<<<<< .cvsignore
 videotest
 mp1parse
 aviparse
-=======
-mp1parse
->>>>>>> 1.2
+avi2mpg
+vidcapture