Merge remote-tracking branch 'tutorials/master'

[platform/upstream/gstreamer.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index aa6d3f9..cad237a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,24 @@
-\r
-Debug\r
-Release\r
-ipch\r
-*.user\r
-*.sdf\r
-*.suo\r
-*.opensdf\r
-vs/2010/libs\r
-bin\r
-gen\r
-libs\r
-obj\r
-.classpath\r
-.project\r
-.settings\r
-.libs\r
-.cproject\r
-gst-build\r
-project.properties\r
-gst_sdk\r
-.DS_Store\r
-xcuserdata\r
+/built_doc
+/hotdoc-private*
+Debug
+Release
+ipch
+*.user
+*.sdf
+*.suo
+*.opensdf
+vs/2010/libs
+bin
+gen
+libs
+obj
+.classpath
+.project
+.settings
+.libs
+.cproject
+gst-build
+project.properties
+gst_sdk
+.DS_Store
+xcuserdata