Fixed some build errors.

Original commit message from CVS:
Fixed some build errors.

diff --git a/docs/gst/.gitignore b/docs/gst/.gitignore
index b6a6a3c..b4b5f1c 100644 (file)
--- 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
+

diff --git a/test/.gitignore b/test/.gitignore
index a99922f..d5f47ee 100644 (file)
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -33,10 +33,8 @@ ac3play
 dvdcat
 fake
 cobin
-<<<<<<< .cvsignore
 videotest
 mp1parse
 aviparse
-=======
-mp1parse
->>>>>>> 1.2
+avi2mpg
+vidcapture