Merge remote-tracking branch 'tutorials/master'
authorOlivier Crête <olivier.crete@collabora.com>
Sun, 9 Oct 2016 13:26:01 +0000 (15:26 +0200)
committerOlivier Crête <olivier.crete@collabora.com>
Sun, 9 Oct 2016 13:26:01 +0000 (15:26 +0200)
1  2 
.gitignore

diff --cc .gitignore
index 1d95d595a99e0ee2c8166ac4594ed3733c18694d,aa6d3f995041d3ec535e5b6dd716500fe2ffc404..cad237a38e022ce57585401810819091adf1e670
@@@ -1,2 -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