aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorBrad Davis <[email protected]>2013-09-13 12:21:12 -0700
committerBrad Davis <[email protected]>2013-09-13 12:21:12 -0700
commitd4753fd0a4fcf82c8ef6084294d785cf29446050 (patch)
treea8cbe918c71cb76423ecbc7ef984627f55be8067 /.gitignore
parentd03b5d674d1f623a5c5ba752f4f518dcbe765ea8 (diff)
parentcacc151aea8236163af7fbb477e3be07873a4d37 (diff)
Merging down .gitignore changes
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore33
1 files changed, 28 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index 03be30e..b3cfa0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,34 @@
+# The project gitignore file is primarily for specifying artifacts in
+# the Official SDK which we do not wish to track in Git, but which we
+# Should expect to exist in any directory where the official SDK has
+# been placed along with the Git repository
+
+# Please do not submit pull requests with .gitignore modifications
+# without fist opening an issue or some other dialogue to
+# ensure that a change to the .gitignore is the right thing to do.
+
+# Also, do not submit pull requests with .gitignore modifications
+# mixed in with other unrelated changes.
+
+
+Doc
LibOVR/Lib
LibOVR/Obj
+Mac_OculusWorldDemo.app/Contents/Resources
+OculusWorldDemo.app
Samples/**/Obj
Samples/**/Release
Samples/**/Debug
-Samples/OculusWorldDemo/Assets
-Mac_OculusWorldDemo.app/Contents/Resources
-Doc
Tools
-.*
-OculusWorldDemo.app
+
+# Do not include items like these that are not specific to this project.
+# .*
+# *~
+
+# If you need to exclude temp or backup files or files created your build
+# system, you should place those in a global gitignore file in your root
+# directory.
+# See: https://help.github.com/articles/ignoring-files
+
+
+