summaryrefslogtreecommitdiff
path: root/src/glsl/.gitignore
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2010-08-16 19:08:53 -0700
committerIan Romanick <ian.d.romanick@intel.com>2010-08-16 19:08:53 -0700
commit6c03c576cc49bbb008de66d374f4302ff0fe0390 (patch)
tree7ddeb3ee88532d9aef8728b9aa256edf7c125247 /src/glsl/.gitignore
parent15a3b42e135a3a2cb463ec3cff80a55dd8528051 (diff)
parenta433cd286c60eb9d4c2114f042709eda0f3de676 (diff)
Merge branch 'glsl2'
Conflicts: src/mesa/program/prog_optimize.c
Diffstat (limited to 'src/glsl/.gitignore')
-rw-r--r--src/glsl/.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/glsl/.gitignore b/src/glsl/.gitignore
new file mode 100644
index 0000000000..4c212313e4
--- /dev/null
+++ b/src/glsl/.gitignore
@@ -0,0 +1,2 @@
+glsl_compiler
+glsl_parser.output