From: Olivier Crête <olivier.crete@collabora.com>
Date: Sun, 9 Oct 2016 13:26:01 +0000 (+0200)
Subject: Merge remote-tracking branch 'tutorials/master'
X-Git-Tag: 1.19.3~489^2~562
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0ab2ce02ce2ea7c944ea606c01eb9a4dfd1ef5b0;p=platform%2Fupstream%2Fgstreamer.git

Merge remote-tracking branch 'tutorials/master'
---

0ab2ce02ce2ea7c944ea606c01eb9a4dfd1ef5b0
diff --cc .gitignore
index 1d95d59,aa6d3f9..cad237a
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,23 +1,24 @@@
 -
 -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
 +/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